Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrated all projects to packagereference #739

Merged
merged 1 commit into from
Aug 10, 2019
Merged

Migrated all projects to packagereference #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Source/Core/Duality/Duality.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,19 +469,16 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="NVorbis, Version=0.7.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.NVorbis.0.7.6\lib\portable45-net45+win8+wpa81\NVorbis.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="AdamsLair.NVorbis" GeneratePathProperty="true">
<Version>0.7.6</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).xml" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)NVorbis.dll" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)NVorbis.xml" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(PkgAdamsLair_NVorbis)\lib\portable45-net45+win8+wpa81\NVorbis.dll" DestinationFolder="$(SolutionDir)Build\Output\"/>
<Copy SourceFiles="$(PkgAdamsLair_NVorbis)\lib\portable45-net45+win8+wpa81\NVorbis.xml" DestinationFolder="$(SolutionDir)Build\Output\"/>
</Target>
</Project>
4 changes: 0 additions & 4 deletions Source/Core/Duality/packages.config
View file
Open in desktop

This file was deleted.

37 changes: 19 additions & 18 deletions Source/Editor/DualityEditor/DualityEditor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,29 +46,14 @@
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="AdamsLair.WinForms, Version=1.1.17.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.WinForms.1.1.17\lib\net45\AdamsLair.WinForms.dll</HintPath>
</Reference>
<Reference Include="Aga.Controls, Version=1.7.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.TreeViewAdv.1.7.7\lib\net20\Aga.Controls.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Build" />
<Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>
</Reference>
<Reference Include="PopupControl, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.WinForms.PopupControl.1.0.1\lib\net40\PopupControl.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.XML" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.8.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.DockPanelSuite.2.8.2\lib\net20\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
<Reference Include="Windows7.DesktopIntegration">
<HintPath>.\Windows7.DesktopIntegration.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -391,7 +376,6 @@
</Compile>
<None Include="app.config" />
<None Include="app.manifest" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down Expand Up @@ -460,14 +444,31 @@
<None Include="EmbeddedResources\CursorArrow.png" />
<None Include="EmbeddedResources\cog.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AdamsLair.DockPanelSuite">
<Version>2.8.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.TreeViewAdv">
<Version>1.7.7</Version>
</PackageReference>
<PackageReference Include="AdamsLair.WinForms" GeneratePathProperty="true">
<Version>1.1.17</Version>
</PackageReference>
<PackageReference Include="Microsoft.Web.Xdt">
<Version>2.1.1</Version>
</PackageReference>
<PackageReference Include="NuGet.Core">
<Version>2.14.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
<Copy SourceFiles="$(OutputPath)$(AssemblyName).exe" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).exe.config" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).xml" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)AdamsLair.WinForms.dll" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)AdamsLair.WinForms.xml" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(PkgAdamsLair_WinForms)\lib\net45\AdamsLair.WinForms.dll" DestinationFolder="$(SolutionDir)Build\Output\"/>
<Copy SourceFiles="$(PkgAdamsLair_WinForms)\lib\net45\AdamsLair.WinForms.xml" DestinationFolder="$(SolutionDir)Build\Output\"/>
<Copy SourceFiles="$(OutputPath)Aga.Controls.dll" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)NuGet.Core.dll" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)PopupControl.dll" DestinationFolder="$(SolutionDir)Build\Output\" />
Expand Down
9 changes: 0 additions & 9 deletions Source/Editor/DualityEditor/packages.config
View file
Open in desktop

This file was deleted.

11 changes: 5 additions & 6 deletions Source/Platform/DefaultOpenTK/DefaultOpenTK.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.OpenTK.1.2.2\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml.Linq" />
Expand Down Expand Up @@ -89,15 +86,17 @@
</Content>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="AdamsLair.OpenTK" GeneratePathProperty="true">
<Version>1.2.2</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="$(SolutionDir)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb" DestinationFolder="$(SolutionDir)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)OpenALSoft32.dll" DestinationFolder="$(SolutionDir)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)OpenALSoft64.dll" DestinationFolder="$(SolutionDir)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)OpenTK.dll" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)OpenTK.xml" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(PkgAdamsLair_OpenTK)\lib\net20\OpenTK.dll" DestinationFolder="$(SolutionDir)Build\Output\"/>
<Copy SourceFiles="$(PkgAdamsLair_OpenTK)\lib\net20\OpenTK.xml" DestinationFolder="$(SolutionDir)Build\Output\"/>
</Target>
</Project>
4 changes: 0 additions & 4 deletions Source/Platform/DefaultOpenTK/packages.config
View file
Open in desktop

This file was deleted.

17 changes: 8 additions & 9 deletions Source/Platform/DefaultOpenTKEditor/DefaultOpenTK.Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.OpenTK.1.2.2\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="OpenTK.GLControl, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.OpenTK.GLControl.1.2.2\lib\net20\OpenTK.GLControl.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
Expand Down Expand Up @@ -79,13 +73,18 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="AdamsLair.OpenTK">
<Version>1.2.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.OpenTK.GLControl" GeneratePathProperty="true">
<Version>1.2.2</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="$(SolutionDir)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb" DestinationFolder="$(SolutionDir)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)OpenTK.GLControl.dll" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(OutputPath)OpenTK.GLControl.xml" DestinationFolder="$(SolutionDir)Build\Output\" />
<Copy SourceFiles="$(PkgAdamsLair_OpenTK_GLControl)\lib\net20\OpenTK.GLControl.dll" DestinationFolder="$(SolutionDir)Build\Output\"/>
<Copy SourceFiles="$(PkgAdamsLair_OpenTK_GLControl)\lib\net20\OpenTK.GLControl.xml" DestinationFolder="$(SolutionDir)Build\Output\"/>
</Target>
</Project>
5 changes: 0 additions & 5 deletions Source/Platform/DefaultOpenTKEditor/packages.config
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions Source/Plugins/EditorBase/EditorBase.Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,11 @@
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="AdamsLair.WinForms, Version=1.1.17.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.WinForms.1.1.17\lib\net45\AdamsLair.WinForms.dll</HintPath>
</Reference>
<Reference Include="PopupControl, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.WinForms.PopupControl.1.0.1\lib\net40\PopupControl.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.XML" />
<Reference Include="System.Xml.Linq" />
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.8.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AdamsLair.DockPanelSuite.2.8.2\lib\net20\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="DataConverters\ComponentFromSound.cs" />
Expand Down Expand Up @@ -202,7 +193,14 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<PackageReference Include="AdamsLair.DockPanelSuite">
<Version>2.8.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.WinForms">
<Version>1.1.17</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Include="EmbeddedResources\IconHideIndices.png" />
<None Include="EmbeddedResources\IconRevealIndices.png" />
Expand All @@ -227,7 +225,6 @@
<Content Include="EmbeddedResources\eye.ico" />
<None Include="EmbeddedResources\IconSpeakerBlack.png" />
<None Include="EmbeddedResources\IconSpeakerWhite.png" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
Expand Down
6 changes: 0 additions & 6 deletions Source/Plugins/EditorBase/packages.config
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions Source/Plugins/EditorModules/CamView/CamView.Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,11 @@
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="AdamsLair.WinForms, Version=1.1.17.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AdamsLair.WinForms.1.1.17\lib\net45\AdamsLair.WinForms.dll</HintPath>
</Reference>
<Reference Include="PopupControl, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AdamsLair.WinForms.PopupControl.1.0.1\lib\net40\PopupControl.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.XML" />
<Reference Include="System.Xml.Linq" />
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.8.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AdamsLair.DockPanelSuite.2.8.2\lib\net20\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CamViewLayers\GridLayerData.cs" />
Expand Down Expand Up @@ -159,7 +150,14 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<PackageReference Include="AdamsLair.DockPanelSuite">
<Version>2.8.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.WinForms">
<Version>1.1.17</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Content Include="EmbeddedResources\iconShapeSelect.png" />
<Content Include="EmbeddedResources\monitor.png" />
Expand All @@ -181,7 +179,6 @@
<None Include="EmbeddedResources\iconCmpEdgeCollider.png" />
<None Include="EmbeddedResources\iconCmpLoopCollider.png" />
<None Include="EmbeddedResources\magnifier_one.png" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
Expand Down
6 changes: 0 additions & 6 deletions Source/Plugins/EditorModules/CamView/packages.config
View file
Open in desktop

This file was deleted.

18 changes: 8 additions & 10 deletions Source/Plugins/EditorModules/HelpAdvisor/HelpAdvisor.Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,11 @@
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="AdamsLair.WinForms, Version=1.1.17.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AdamsLair.WinForms.1.1.17\lib\net45\AdamsLair.WinForms.dll</HintPath>
</Reference>
<Reference Include="PopupControl, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AdamsLair.WinForms.PopupControl.1.0.1\lib\net40\PopupControl.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.8.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AdamsLair.DockPanelSuite.2.8.2\lib\net20\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="HelpAdvisor.cs">
Expand Down Expand Up @@ -96,7 +87,14 @@
</ItemGroup>
<ItemGroup>
<None Include="EmbeddedResources\help.png" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AdamsLair.DockPanelSuite">
<Version>2.8.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.WinForms">
<Version>1.1.17</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
Expand Down
6 changes: 0 additions & 6 deletions Source/Plugins/EditorModules/HelpAdvisor/packages.config
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions Source/Plugins/EditorModules/LogView/LogView.Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,11 @@
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="AdamsLair.WinForms, Version=1.1.17.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AdamsLair.WinForms.1.1.17\lib\net45\AdamsLair.WinForms.dll</HintPath>
</Reference>
<Reference Include="PopupControl, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AdamsLair.WinForms.PopupControl.1.0.1\lib\net40\PopupControl.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.XML" />
<Reference Include="System.Xml.Linq" />
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.8.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\AdamsLair.DockPanelSuite.2.8.2\lib\net20\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="LogViewPlugin.cs" />
Expand Down Expand Up @@ -107,7 +98,14 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<PackageReference Include="AdamsLair.DockPanelSuite">
<Version>2.8.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.WinForms">
<Version>1.1.17</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Include="EmbeddedResources\bell.png" />
<None Include="EmbeddedResources\cross.png" />
Expand All @@ -119,7 +117,6 @@
<None Include="EmbeddedResources\log_warning.png" />
<None Include="EmbeddedResources\logview.ico" />
<None Include="EmbeddedResources\logview.png" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
Expand Down
6 changes: 0 additions & 6 deletions Source/Plugins/EditorModules/LogView/packages.config
View file
Open in desktop

This file was deleted.

Loading