Skip to content

Commit

Permalink
Merge branch 'v/2.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwmkerr
dwmkerr committed Jan 29, 2015
2 parents cad3993 + 084667e commit b09eac3
Show file tree
Hide file tree
Showing 145 changed files with 2,088 additions and 948 deletions.
6 changes: 6 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,9 @@ build/nuspec/SharpGLforWinForms/lib/
build/nuspec/SharpGLforWPF/lib/
release/2.*
source/SharpGL/packages/

# Ignores for the extensions.
extensions/build/SharpGL.2010.vsix
extensions/build/SharpGL.vsix
extensions/Seeds/packages
*.GhostDoc.xml
8 changes: 6 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#Version 2.5 (In Progress)
#Version 2.4 (In Progress)

* All imported APIs now use 'SetLastError = true' to aid in analysing issues (thanks [robinsedlaczek](https://github.com/robinsedlaczek).
* All imported APIs now use 'SetLastError = true' to aid in analysing issues (thanks [robinsedlaczek](https://github.com/robinsedlaczek).
* Improvments to the robustness of bitmap management in render contexts (thanks [robinsedlaczek](https://github.com/robinsedlaczek).
* Extensions have been moved into their own location in the repository, isolate from the main code.
* Extension projects reference SharpGL via Nuget.
* Fixed issues with `glGetActiveAttrib` and `glGetActiveUniform`.
15 changes: 0 additions & 15 deletions build/nuspec/SharpGLCore/SharpGLCore.nuspec
View file

This file was deleted.

40 changes: 40 additions & 0 deletions extensions/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Extensions
==========

This folder contains all of the code and scripts required to build the
Visual Studio Extensions for SharpGL.

* `Seeds`: Actual SharpGL projects which are the seeds of the project templates.
* `SharpGL.2010`: Code for `SharpGL.2010.vsix`.
* `SharpGL`: Code for `SharpGL.vsix`.
* `build`: Scripts and code to build the vsix packages.

Building the VS2012 & VS2013 Extensions
---------------------------------------

To open and build the 2012/2013 extensions, you will need Visual Studio 2013
installed as well as the [Visual Studio 2013 SDK](http://www.microsoft.com/en-us/download/details.aspx?id=40758).

To build the VS 2012/2013 extensions, run the script below:

```
.\extensions\build\BuildSharpGL2010Extensions.ps1
```

The VSIX is built to `.\extensions\build\SharpGL.vsix`. This vsix targets both
editions of Visaul Studio.

Building the VS2010 Extensions
------------------------------

To open the VS 2010 extensions solution, you will need to install the
[Visual Studio 2010 SDK](http://www.microsoft.com/en-us/download/details.aspx?id=2680).

Please be aware that the VS 2010 extensions are no longer being maintained.
To build these extensions, run the script below:

```
.\extensions\build\BuildSharpGL2010Extensions.ps1
```

The VSIX is built to `.\extensions\build\SharpGL.2010.vsix`.
26 changes: 26 additions & 0 deletions extensions/Seeds/Seeds.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinformsTemplate", "WinformsTemplate\WinformsTemplate.csproj", "{6C2585E6-A4BC-48AF-B706-A1BC02E10250}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfTemplate", "WpfTemplate\WpfTemplate.csproj", "{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|x86.ActiveCfg = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|x86.Build.0 = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|x86.ActiveCfg = Release|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|x86.Build.0 = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|x86.ActiveCfg = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|x86.Build.0 = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|x86.ActiveCfg = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
0 ...ce/Extensions/WinformsTemplate/Program.cs → extensions/Seeds/WinformsTemplate/Program.cs
View file
File renamed without changes.
0 ...nformsTemplate/Properties/AssemblyInfo.cs → ...nformsTemplate/Properties/AssemblyInfo.cs
View file
File renamed without changes.
0 ...Template/Properties/Resources.Designer.cs → ...Template/Properties/Resources.Designer.cs
View file
File renamed without changes.
0 ...informsTemplate/Properties/Resources.resx → ...informsTemplate/Properties/Resources.resx
View file
File renamed without changes.
0 ...sTemplate/Properties/Settings.Designer.cs → ...sTemplate/Properties/Settings.Designer.cs
View file
File renamed without changes.
0 ...ormsTemplate/Properties/Settings.settings → ...ormsTemplate/Properties/Settings.settings
View file
File renamed without changes.
0 .../WinformsTemplate/SharpGLForm.Designer.cs → .../WinformsTemplate/SharpGLForm.Designer.cs
View file
File renamed without changes.
0 ...xtensions/WinformsTemplate/SharpGLForm.cs → ...ons/Seeds/WinformsTemplate/SharpGLForm.cs
View file
File renamed without changes.
0 ...ensions/WinformsTemplate/SharpGLForm.resx → ...s/Seeds/WinformsTemplate/SharpGLForm.resx
View file
File renamed without changes.
18 changes: 7 additions & 11 deletions .../WinformsTemplate/WinformsTemplate.csproj → .../WinformsTemplate/WinformsTemplate.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpGL, Version=2.0.0.0, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<Reference Include="SharpGL, Version=2.3.0.1, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Dependencies\SharpGL.dll</HintPath>
<HintPath>..\packages\SharpGLCore.2.3.0.1\lib\net40\SharpGL.dll</HintPath>
</Reference>
<Reference Include="SharpGL.SceneGraph, Version=1.0.0.0, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<Reference Include="SharpGL.SceneGraph, Version=2.3.0.1, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Dependencies\SharpGL.SceneGraph.dll</HintPath>
<HintPath>..\packages\SharpGLCore.2.3.0.1\lib\net40\SharpGL.SceneGraph.dll</HintPath>
</Reference>
<Reference Include="SharpGL.WinForms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<Reference Include="SharpGL.WinForms, Version=2.3.0.1, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Dependencies\SharpGL.WinForms.dll</HintPath>
<HintPath>..\packages\SharpGLforWinForms.2.3.0.1\lib\net40\SharpGL.WinForms.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -89,6 +89,7 @@
<DependentUpon>SharpGLForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand All @@ -100,11 +101,6 @@
</Compile>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="Dependencies\SharpGL.dll" />
<None Include="Dependencies\SharpGL.SceneGraph.dll" />
<None Include="Dependencies\SharpGL.WinForms.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
0 ...ce/Extensions/WinformsTemplate/app.config → extensions/Seeds/WinformsTemplate/app.config
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions extensions/Seeds/WinformsTemplate/packages.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SharpGLCore" version="2.3.0.1" targetFramework="net40" />
<package id="SharpGLforWinForms" version="2.3.0.1" targetFramework="net40" />
</packages>
0 source/Extensions/WpfTemplate/App.xaml → extensions/Seeds/WpfTemplate/App.xaml
View file
File renamed without changes.
0 source/Extensions/WpfTemplate/App.xaml.cs → extensions/Seeds/WpfTemplate/App.xaml.cs
View file
File renamed without changes.
0 ...ce/Extensions/WpfTemplate/MainWindow.xaml → extensions/Seeds/WpfTemplate/MainWindow.xaml
View file
File renamed without changes.
0 ...Extensions/WpfTemplate/MainWindow.xaml.cs → ...ions/Seeds/WpfTemplate/MainWindow.xaml.cs
View file
File renamed without changes.
0 ...ns/WpfTemplate/Properties/AssemblyInfo.cs → ...ds/WpfTemplate/Properties/AssemblyInfo.cs
View file
File renamed without changes.
0 ...Template/Properties/Resources.Designer.cs → ...Template/Properties/Resources.Designer.cs
View file
File renamed without changes.
0 ...ateProject.2010/Properties/Resources.resx → ...eds/WpfTemplate/Properties/Resources.resx
View file
File renamed without changes.
0 ...fTemplate/Properties/Settings.Designer.cs → ...fTemplate/Properties/Settings.Designer.cs
View file
File renamed without changes.
0 .../WpfTemplate/Properties/Settings.settings → .../WpfTemplate/Properties/Settings.settings
View file
File renamed without changes.
13 changes: 7 additions & 6 deletions ...Extensions/WpfTemplate/WpfTemplate.csproj → ...ions/Seeds/WpfTemplate/WpfTemplate.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpGL, Version=2.0.0.0, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<Reference Include="SharpGL, Version=2.3.0.1, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Dependencies\SharpGL.dll</HintPath>
<HintPath>..\packages\SharpGLCore.2.3.0.1\lib\net40\SharpGL.dll</HintPath>
</Reference>
<Reference Include="SharpGL.SceneGraph, Version=1.0.0.0, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<Reference Include="SharpGL.SceneGraph, Version=2.3.0.1, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Dependencies\SharpGL.SceneGraph.dll</HintPath>
<HintPath>..\packages\SharpGLCore.2.3.0.1\lib\net40\SharpGL.SceneGraph.dll</HintPath>
</Reference>
<Reference Include="SharpGL.WPF, Version=2.0.0.0, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<Reference Include="SharpGL.WPF, Version=2.3.0.1, Culture=neutral, PublicKeyToken=27fc851303210b27, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Dependencies\SharpGL.WPF.dll</HintPath>
<HintPath>..\packages\SharpGLforWPF.2.3.0.1\lib\net40\SharpGL.WPF.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -110,6 +110,7 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down
0 ...s/WinformsTemplateProject.2010/app.config → extensions/Seeds/WpfTemplate/app.config
View file
File renamed without changes.
5 changes: 5 additions & 0 deletions extensions/Seeds/WpfTemplate/packages.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SharpGLCore" version="2.3.0.1" targetFramework="net40" />
<package id="SharpGLforWPF" version="2.3.0.1" targetFramework="net40" />
</packages>
24 changes: 0 additions & 24 deletions source/Extensions/Extensions.2010.sln → extensions/SharpGL.2010/Extensions.2010.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpGL.2010", "SharpGL.2010\SharpGL.2010.csproj", "{A08D9E9C-BF4B-4B4B-918E-471396B96B78}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinformsTemplate", "WinformsTemplate\WinformsTemplate.csproj", "{6C2585E6-A4BC-48AF-B706-A1BC02E10250}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinformsTemplateProject.2010", "WinformsTemplateProject.2010\WinformsTemplateProject.2010.csproj", "{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfTemplate", "WpfTemplate\WpfTemplate.csproj", "{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfTemplateProject.2010", "WpfTemplateProject.2010\WpfTemplateProject.2010.csproj", "{E0B3D9B1-A682-4124-8AE5-0A94644EFF36}"
EndProject
Global
Expand All @@ -31,16 +27,6 @@ Global
{A08D9E9C-BF4B-4B4B-918E-471396B96B78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{A08D9E9C-BF4B-4B4B-918E-471396B96B78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A08D9E9C-BF4B-4B4B-918E-471396B96B78}.Release|x86.ActiveCfg = Release|Any CPU
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|Any CPU.ActiveCfg = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|Mixed Platforms.Build.0 = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|x86.ActiveCfg = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|x86.Build.0 = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|Any CPU.ActiveCfg = Release|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|Mixed Platforms.ActiveCfg = Release|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|Mixed Platforms.Build.0 = Release|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|x86.ActiveCfg = Release|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|x86.Build.0 = Release|x86
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand All @@ -51,16 +37,6 @@ Global
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Release|x86.ActiveCfg = Release|Any CPU
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|Any CPU.ActiveCfg = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|Mixed Platforms.Build.0 = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|x86.ActiveCfg = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|x86.Build.0 = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|Any CPU.ActiveCfg = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|Mixed Platforms.Build.0 = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|x86.ActiveCfg = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|x86.Build.0 = Release|x86
{E0B3D9B1-A682-4124-8AE5-0A94644EFF36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E0B3D9B1-A682-4124-8AE5-0A94644EFF36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0B3D9B1-A682-4124-8AE5-0A94644EFF36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand Down
0 ...s/SharpGL.2010/Properties/AssemblyInfo.cs → ...0/SharpGL.2010/Properties/AssemblyInfo.cs
View file
File renamed without changes.
0 ...tensions/SharpGL.2010/SharpGL.2010.csproj → ...pGL.2010/SharpGL.2010/SharpGL.2010.csproj
View file
File renamed without changes.
0 source/Extensions/SharpGL.2010/SharpGL.JPG → ...ons/SharpGL.2010/SharpGL.2010/SharpGL.JPG
View file
File renamed without changes
0 source/Extensions/SharpGL.2010/SharpGL.ico → ...ons/SharpGL.2010/SharpGL.2010/SharpGL.ico
View file
File renamed without changes.
0 source/Extensions/SharpGL.2010/SharpGL.snk → ...ons/SharpGL.2010/SharpGL.2010/SharpGL.snk
View file
File renamed without changes.
0 ...xtensions/SharpGL.2010/SharpGLLicense.txt → ...rpGL.2010/SharpGL.2010/SharpGLLicense.txt
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...harpGL.2010/source.extension.vsixmanifest → ...harpGL.2010/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Identifier Id="SharpGL..f7275bce-f976-42a4-adb8-b5c2f5f3b4f5">
<Name>SharpGL</Name>
<Author>Dave Kerr</Author>
<Version>2.3.0</Version>
<Version>2.3.1</Version>
<Description xml:space="preserve">SharpGL gives you the power of OpenGL in your C# applications.</Description>
<Locale>1033</Locale>
<MoreInfoUrl>http://sharpgl.codeplex.com</MoreInfoUrl>
Expand Down
0 ...formsTemplateProject.2010/AssemblyInfo.cs → ...formsTemplateProject.2010/AssemblyInfo.cs
View file
File renamed without changes.
Binary file renamed ...plate/Dependencies/SharpGL.SceneGraph.dll → ....2010/Dependencies/SharpGL.SceneGraph.dll
View file
Binary file not shown.
Binary file renamed ...emplate/Dependencies/SharpGL.WinForms.dll → ...ct.2010/Dependencies/SharpGL.WinForms.dll
View file
Binary file not shown.
Binary file renamed ...WinformsTemplate/Dependencies/SharpGL.dll → ...lateProject.2010/Dependencies/SharpGL.dll
View file
Binary file not shown.
0 ...s/WinformsTemplateProject.2010/Program.cs → ...0/WinformsTemplateProject.2010/Program.cs
View file
File renamed without changes.
0 ...teProject.2010/Properties/AssemblyInfo.cs → ...teProject.2010/Properties/AssemblyInfo.cs
View file
File renamed without changes.
0 ...ect.2010/Properties/Resources.Designer.cs → ...ect.2010/Properties/Resources.Designer.cs
View file
File renamed without changes.
0 ...TemplateProject/Properties/Resources.resx → ...ateProject.2010/Properties/Resources.resx
View file
File renamed without changes.
0 ...ject.2010/Properties/Settings.Designer.cs → ...ject.2010/Properties/Settings.Designer.cs
View file
File renamed without changes.
0 ...Project.2010/Properties/Settings.settings → ...Project.2010/Properties/Settings.settings
View file
File renamed without changes.
0 ...plateProject.2010/SharpGLForm.Designer.cs → ...plateProject.2010/SharpGLForm.Designer.cs
View file
File renamed without changes.
0 ...nformsTemplateProject.2010/SharpGLForm.cs → ...nformsTemplateProject.2010/SharpGLForm.cs
View file
File renamed without changes.
0 ...ormsTemplateProject.2010/SharpGLForm.resx → ...ormsTemplateProject.2010/SharpGLForm.resx
View file
File renamed without changes.
0 ...plateProject.2010/WinformsTemplate.csproj → ...plateProject.2010/WinformsTemplate.csproj
View file
File renamed without changes.
0 ....2010/WinformsTemplateProject.2010.csproj → ....2010/WinformsTemplateProject.2010.csproj
View file
File renamed without changes.
0 ...t.2010/WinformsTemplateProject.vstemplate → ...t.2010/WinformsTemplateProject.vstemplate
View file
File renamed without changes.
0 ...msTemplateProject.2010/__TemplateIcon.ico → ...msTemplateProject.2010/__TemplateIcon.ico
View file
File renamed without changes.
0 source/Extensions/WpfTemplate/app.config → ...0/WinformsTemplateProject.2010/app.config
View file
File renamed without changes.
0 ...tensions/WpfTemplateProject.2010/App.xaml → ...pGL.2010/WpfTemplateProject.2010/App.xaml
View file
File renamed without changes.
0 ...sions/WpfTemplateProject.2010/App.xaml.cs → ....2010/WpfTemplateProject.2010/App.xaml.cs
View file
File renamed without changes.
0 ...s/WinformsTemplateProject/AssemblyInfo.cs → ...0/WpfTemplateProject.2010/AssemblyInfo.cs
View file
File renamed without changes.
Binary file renamed ....2010/Dependencies/SharpGL.SceneGraph.dll → ....2010/Dependencies/SharpGL.SceneGraph.dll
View file
Binary file not shown.
Binary file renamed ...Project.2010/Dependencies/SharpGL.WPF.dll → ...Project.2010/Dependencies/SharpGL.WPF.dll
View file
Binary file not shown.
Binary file renamed ...lateProject.2010/Dependencies/SharpGL.dll → ...lateProject.2010/Dependencies/SharpGL.dll
View file
Binary file not shown.
0 ...s/WpfTemplateProject.2010/MainWindow.xaml → ...0/WpfTemplateProject.2010/MainWindow.xaml
View file
File renamed without changes.
0 ...pfTemplateProject.2010/MainWindow.xaml.cs → ...pfTemplateProject.2010/MainWindow.xaml.cs
View file
File renamed without changes.
0 ...teProject.2010/Properties/AssemblyInfo.cs → ...teProject.2010/Properties/AssemblyInfo.cs
View file
File renamed without changes.
0 ...eProject/Properties/Resources.Designer.cs → ...ect.2010/Properties/Resources.Designer.cs
View file
File renamed without changes.
0 ...ons/WpfTemplate/Properties/Resources.resx → ...ateProject.2010/Properties/Resources.resx
View file
File renamed without changes.
0 ...teProject/Properties/Settings.Designer.cs → ...ject.2010/Properties/Settings.Designer.cs
View file
File renamed without changes.
0 ...Project.2010/Properties/Settings.settings → ...Project.2010/Properties/Settings.settings
View file
File renamed without changes.
0 ...pfTemplateProject.2010/WpfTemplate.csproj → ...pfTemplateProject.2010/WpfTemplate.csproj
View file
File renamed without changes.
0 ...oject.2010/WpfTemplateProject.2010.csproj → ...oject.2010/WpfTemplateProject.2010.csproj
View file
File renamed without changes.
0 ...mplateProject.2010/WpfTemplateProject.ico → ...mplateProject.2010/WpfTemplateProject.ico
View file
File renamed without changes.
0 ...roject.2010/WpfTemplateProject.vstemplate → ...roject.2010/WpfTemplateProject.vstemplate
View file
File renamed without changes.
0 ...pfTemplateProject.2010/__TemplateIcon.ico → ...pfTemplateProject.2010/__TemplateIcon.ico
View file
File renamed without changes.
0 ...nsions/WpfTemplateProject.2010/app.config → ...L.2010/WpfTemplateProject.2010/app.config
View file
File renamed without changes.
28 changes: 3 additions & 25 deletions source/Extensions/Extensions.sln → extensions/SharpGL/Extensions.sln
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpGL", "SharpGL\SharpGL.csproj", "{B008CF5B-E6B4-4AE6-9800-2BB34AC785C5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinformsTemplate", "WinformsTemplate\WinformsTemplate.csproj", "{6C2585E6-A4BC-48AF-B706-A1BC02E10250}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinformsTemplateProject", "WinformsTemplateProject\WinformsTemplateProject.csproj", "{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfTemplate", "WpfTemplate\WpfTemplate.csproj", "{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfTemplateProject", "WpfTemplateProject\WpfTemplateProject.csproj", "{E0B3D9B1-A682-4124-8AE5-0A94644EFF36}"
EndProject
Global
Expand All @@ -31,16 +29,6 @@ Global
{B008CF5B-E6B4-4AE6-9800-2BB34AC785C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B008CF5B-E6B4-4AE6-9800-2BB34AC785C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B008CF5B-E6B4-4AE6-9800-2BB34AC785C5}.Release|x86.ActiveCfg = Release|Any CPU
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|Any CPU.ActiveCfg = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|Mixed Platforms.Build.0 = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|x86.ActiveCfg = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Debug|x86.Build.0 = Debug|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|Any CPU.ActiveCfg = Release|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|Mixed Platforms.ActiveCfg = Release|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|Mixed Platforms.Build.0 = Release|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|x86.ActiveCfg = Release|x86
{6C2585E6-A4BC-48AF-B706-A1BC02E10250}.Release|x86.Build.0 = Release|x86
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand All @@ -51,16 +39,6 @@ Global
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F121FFB2-8F7F-4374-930C-D8C80AFFB6BF}.Release|x86.ActiveCfg = Release|Any CPU
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|Any CPU.ActiveCfg = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|Mixed Platforms.Build.0 = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|x86.ActiveCfg = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Debug|x86.Build.0 = Debug|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|Any CPU.ActiveCfg = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|Mixed Platforms.Build.0 = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|x86.ActiveCfg = Release|x86
{0DF52E36-AF0D-4D1A-B607-1BDBB2238510}.Release|x86.Build.0 = Release|x86
{E0B3D9B1-A682-4124-8AE5-0A94644EFF36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E0B3D9B1-A682-4124-8AE5-0A94644EFF36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0B3D9B1-A682-4124-8AE5-0A94644EFF36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand Down
0 source/Extensions/SharpGL/License.txt → extensions/SharpGL/SharpGL/License.txt
View file
File renamed without changes.
Binary file added extensions/SharpGL/SharpGL/Packages/SharpGLCore.2.3.0.1.nupkg
View file
Binary file not shown.
Binary file added extensions/SharpGL/SharpGL/Packages/SharpGLforWPF.2.3.0.1.nupkg
View file
Binary file not shown.
Binary file added extensions/SharpGL/SharpGL/Packages/SharpGLforWinForms.2.3.0.1.nupkg
View file
Binary file not shown.
0 ...nsions/SharpGL/Properties/AssemblyInfo.cs → ...harpGL/SharpGL/Properties/AssemblyInfo.cs
View file
File renamed without changes.
0 source/Extensions/SharpGL/SharpGL.JPG → extensions/SharpGL/SharpGL/SharpGL.JPG
View file
File renamed without changes
16 changes: 15 additions & 1 deletion source/Extensions/SharpGL/SharpGL.csproj → extensions/SharpGL/SharpGL/SharpGL.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -45,6 +50,15 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Packages\SharpGLCore.2.3.0.1.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\SharpGLforWinForms.2.3.0.1.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\SharpGLforWPF.2.3.0.1.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
Expand Down
0 source/Extensions/SharpGL/SharpGL.ico → extensions/SharpGL/SharpGL/SharpGL.ico
View file
File renamed without changes.
Loading

0 comments on commit b09eac3

Please sign in to comment.