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.

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

Change plugin projects to netstandard and sdk style csproj's #741

Merged
merged 1 commit into from
Apr 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions Build/NuGetPackageSpecs/AudioHandling.Sample.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
<files include="**/*" buildAction="None" copyToOutput="true"/>
</contentFiles>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<group targetFramework="netstandard2.0">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\Samples\AudioHandling\Content\Plugins\AudioHandling.core.dll" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\AudioHandling\Content\Plugins\AudioHandling.core.xml" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\AudioHandling\bin\Release\netstandard2.0\AudioHandling.Sample.core.dll" target="lib\netstandard2.0" />
<file src="..\..\Samples\AudioHandling\bin\Release\netstandard2.0\AudioHandling.Sample.core.xml" target="lib\netstandard2.0" />
<file src="..\..\Samples\AudioHandling\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
</files>
</package>
</package>
17 changes: 9 additions & 8 deletions Build/NuGetPackageSpecs/Base.Editor.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
<summary>Provides basic infrastructure for the Duality editor, such as PropertyEditors and Importers.</summary>
<description>Provides basic infrastructure for the Duality editor, such as PropertyEditors and Importers.</description>
<tags>Duality Editor Plugin PropertyEditor Importer Preview EditorAction DataConverter</tags>
<releaseNotes>Patch Version Update
</releaseNotes>
<releaseNotes>Patch Version Update</releaseNotes>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<group targetFramework="net472">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\Output\Plugins\EditorBase.editor.dll" target="lib\net45" />
<file src="..\Output\Plugins\EditorBase.editor.pdb" target="lib\net45" />
<file src="..\Output\Plugins\EditorBase.editor.xml" target="lib\net45" />
<file src="..\Output\Plugins\EditorBase.editor.dll" target="lib\net472" />
<file src="..\Output\Plugins\EditorBase.editor.pdb" target="lib\net472" />
<file src="..\Output\Plugins\EditorBase.editor.xml" target="lib\net472" />
</files>
</package>
</package>
12 changes: 7 additions & 5 deletions Build/NuGetPackageSpecs/BasicMenu.Sample.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
<files include="**/*" buildAction="None" copyToOutput="true"/>
</contentFiles>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<group targetFramework="netstandard2.0">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\Samples\BasicMenu\Content\Plugins\BasicMenu.core.dll" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\BasicMenu\Content\Plugins\BasicMenu.core.xml" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\BasicMenu\bin\Release\netstandard2.0\BasicMenu.Sample.core.dll" target="lib\netstandard2.0" />
<file src="..\..\Samples\BasicMenu\bin\Release\netstandard2.0\BasicMenu.Sample.core.xml" target="lib\netstandard2.0" />
<file src="..\..\Samples\BasicMenu\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
</files>
</package>
</package>
8 changes: 5 additions & 3 deletions Build/NuGetPackageSpecs/BasicShaders.Sample.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
<files include="**/*" buildAction="None" copyToOutput="true"/>
</contentFiles>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<group targetFramework="netstandard2.0">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\Samples\BasicShaders\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
</files>
</package>
</package>
12 changes: 7 additions & 5 deletions Build/NuGetPackageSpecs/Benchmarks.Sample.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
<files include="**/*" buildAction="None" copyToOutput="true"/>
</contentFiles>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<group targetFramework="netstandard2.0">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\Samples\Benchmarks\Content\Plugins\Benchmarks.Sample.core.dll" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\Benchmarks\Content\Plugins\Benchmarks.Sample.core.xml" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\Benchmarks\bin\Release\netstandard2.0\Benchmarks.Sample.core.dll" target="lib\netstandard2.0" />
<file src="..\..\Samples\Benchmarks\bin\Release\netstandard2.0\Benchmarks.Sample.core.xml" target="lib\netstandard2.0" />
<file src="..\..\Samples\Benchmarks\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
</files>
</package>
</package>
15 changes: 8 additions & 7 deletions Build/NuGetPackageSpecs/CamView.Editor.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@
<summary>A basic Camera View editor module.</summary>
<description>A basic Camera View editor module.</description>
<tags>Duality Editor Plugin CamView</tags>
<releaseNotes>Patch Version Update
</releaseNotes>
<releaseNotes>Patch Version Update</releaseNotes>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<group targetFramework="net472">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\Output\Plugins\CamView.editor.dll" target="lib\net45" />
<file src="..\Output\Plugins\CamView.editor.pdb" target="lib\net45" />
<file src="..\Output\Plugins\CamView.editor.dll" target="lib\net472" />
<file src="..\Output\Plugins\CamView.editor.pdb" target="lib\net472" />
</files>
</package>
</package>
12 changes: 7 additions & 5 deletions Build/NuGetPackageSpecs/CameraController.Sample.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
<files include="**/*" buildAction="None" copyToOutput="true"/>
</contentFiles>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<group targetFramework="netstandard2.0">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\Samples\CameraController\Content\Plugins\CameraController.core.dll" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\CameraController\Content\Plugins\CameraController.core.xml" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\CameraController\bin\Release\netstandard2.0\CameraController.Sample.core.dll" target="lib\netstandard2.0" />
<file src="..\..\Samples\CameraController\bin\Release\netstandard2.0\CameraController.Sample.core.xml" target="lib\netstandard2.0" />
<file src="..\..\Samples\CameraController\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
</files>
</package>
</package>
13 changes: 7 additions & 6 deletions Build/NuGetPackageSpecs/Compatibility.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
<summary>Defines helper classes to retain backwards compatibility with older Duality versions.</summary>
<description>Defines helper classes to retain backwards compatibility with older Duality versions.</description>
<tags>Duality Core Plugin Compatibility</tags>
<releaseNotes>Patch Version Update
</releaseNotes>
<releaseNotes>Patch Version Update</releaseNotes>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<group targetFramework="netstandard2.0">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\Output\Plugins\Compatibility.core.dll" target="lib\portable45-net45+win8+wpa81" />
<file src="..\Output\Plugins\Compatibility.core.pdb" target="lib\portable45-net45+win8+wpa81" />
<file src="..\Output\Plugins\Compatibility.core.dll" target="lib\netstandard2.0" />
<file src="..\Output\Plugins\Compatibility.core.pdb" target="lib\netstandard2.0" />
</files>
</package>
</package>
12 changes: 7 additions & 5 deletions Build/NuGetPackageSpecs/CustomRenderingSetup.Sample.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
<files include="**/*" buildAction="None" copyToOutput="true"/>
</contentFiles>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<group targetFramework="netstandard2.0">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\Samples\CustomRenderingSetup\Content\Plugins\CustomRenderingSetup.core.dll" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\CustomRenderingSetup\Content\Plugins\CustomRenderingSetup.core.xml" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\CustomRenderingSetup\bin\Release\netstandard2.0\CustomRenderingSetup.Sample.core.dll" target="lib\netstandard2.0" />
<file src="..\..\Samples\CustomRenderingSetup\bin\Release\netstandard2.0\CustomRenderingSetup.Sample.core.xml" target="lib\netstandard2.0" />
<file src="..\..\Samples\CustomRenderingSetup\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
</files>
</package>
</package>
16 changes: 9 additions & 7 deletions Build/NuGetPackageSpecs/DefaultOpenTKBackend.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@
<releaseNotes>Added Support for Setting Hardware Cursors
#ADD: It is now possible to adjust the hardware cursor on the game window through `INativeWindow`.</releaseNotes>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.OpenTK" version="1.2.2" />
<group targetFramework="net472">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.OpenTK" version="1.2.2" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\Output\Plugins\DefaultOpenTKBackend.core.dll" target="lib\net45" />
<file src="..\Output\Plugins\DefaultOpenTKBackend.core.pdb" target="lib\net45" />
<file src="..\Output\OpenALSoft32.dll" target="lib\net45" />
<file src="..\Output\OpenALSoft64.dll" target="lib\net45" />
<file src="..\Output\Plugins\DefaultOpenTKBackend.core.dll" target="lib\net472" />
<file src="..\Output\Plugins\DefaultOpenTKBackend.core.pdb" target="lib\net472" />
<file src="..\Output\OpenALSoft32.dll" target="lib\net472" />
<file src="..\Output\OpenALSoft64.dll" target="lib\net472" />
</files>
</package>
</package>
21 changes: 11 additions & 10 deletions Build/NuGetPackageSpecs/DefaultOpenTKBackend.Editor.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,19 @@
<summary>The default editor backend layer for Duality.</summary>
<description>The default editor backend layer for Duality. It uses OpenGL WinForms controls to integrate game views with editor UI.</description>
<tags>Duality Editor Plugin Backend</tags>
<releaseNotes>Patch Version Update
</releaseNotes>
<releaseNotes>Patch Version Update</releaseNotes>
<dependencies>
<dependency id="AdamsLair.Duality.Backend.DefaultOpenTK" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<dependency id="AdamsLair.OpenTK" version="1.2.2" />
<dependency id="AdamsLair.OpenTK.GLControl" version="1.2.2" />
<group targetFramework="net472">
<dependency id="AdamsLair.Duality.Backend.DefaultOpenTK" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<dependency id="AdamsLair.OpenTK" version="1.2.2" />
<dependency id="AdamsLair.OpenTK.GLControl" version="1.2.2" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\Output\Plugins\DefaultOpenTKBackend.editor.dll" target="lib\net45" />
<file src="..\Output\Plugins\DefaultOpenTKBackend.editor.pdb" target="lib\net45" />
<file src="..\Output\Plugins\DefaultOpenTKBackend.editor.dll" target="lib\net472" />
<file src="..\Output\Plugins\DefaultOpenTKBackend.editor.pdb" target="lib\net472" />
</files>
</package>
</package>
13 changes: 7 additions & 6 deletions Build/NuGetPackageSpecs/DotNetFrameworkBackend.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@
<description>The default system backend layer for Duality. It uses regular .Net Framework classes, as are available on desktop platforms.</description>
<tags>Duality Core Plugin Backend</tags>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<group targetFramework="net472">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
</group>
</dependencies>
<releaseNotes>Patch Version Update
</releaseNotes>
<releaseNotes>Patch Version Update</releaseNotes>
</metadata>
<files>
<file src="..\Output\Plugins\DotNetFrameworkBackend.core.dll" target="lib\net45" />
<file src="..\Output\Plugins\DotNetFrameworkBackend.core.pdb" target="lib\net45" />
<file src="..\Output\Plugins\DotNetFrameworkBackend.core.dll" target="lib\net472" />
<file src="..\Output\Plugins\DotNetFrameworkBackend.core.pdb" target="lib\net472" />
</files>
</package>
</package>
12 changes: 7 additions & 5 deletions Build/NuGetPackageSpecs/DualStickSpaceShooter.Sample.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
<files include="**/*" buildAction="None" copyToOutput="true"/>
</contentFiles>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
<group targetFramework="netstandard2.0">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.Duality.Editor" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\Samples\DualStickSpaceShooter\Content\Plugins\DualStickSpaceShooter.core.dll" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\DualStickSpaceShooter\Content\Plugins\DualStickSpaceShooter.core.xml" target="lib\portable45-net45+win8+wpa81" />
<file src="..\..\Samples\DualStickSpaceShooter\bin\Release\netstandard2.0\DualStickSpaceShooter.Sample.core.dll" target="lib\netstandard2.0" />
<file src="..\..\Samples\DualStickSpaceShooter\bin\Release\netstandard2.0\DualStickSpaceShooter.Sample.core.xml" target="lib\netstandard2.0" />
<file src="..\..\Samples\DualStickSpaceShooter\Content\Data\**\*.res" target="contentFiles\any\any\Data" />
</files>
</package>
</package>
8 changes: 5 additions & 3 deletions Build/NuGetPackageSpecs/Duality.Docs.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
<releaseNotes>Major Version Update</releaseNotes>
<!-- A dependency to at least some Duality Assembly is required, so this package is recognized as a proper Duality package -->
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<group targetFramework="netstandard2.0">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\Documentation\Help\DDoc.chm" target="lib\portable45-net45+win8+wpa81" />
<file src="..\Documentation\Help\DDoc.chm" target="lib\netstandard2.0" />
</files>
</package>
</package>
31 changes: 16 additions & 15 deletions Build/NuGetPackageSpecs/Duality.Editor.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,27 @@
<summary>The Duality editor.</summary>
<description>The Duality editor.</description>
<tags>Duality Editor</tags>
<releaseNotes>
</releaseNotes>
<releaseNotes></releaseNotes>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.DockPanelSuite" version="2.8.2" />
<dependency id="AdamsLair.TreeViewAdv" version="1.7.7" />
<dependency id="AdamsLair.WinForms" version="1.1.17" />
<dependency id="AdamsLair.WinForms.PopupControl" version="1.0.1" />
<group targetFramework="net472">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<dependency id="AdamsLair.DockPanelSuite" version="2.8.2" />
<dependency id="AdamsLair.TreeViewAdv" version="1.7.7" />
<dependency id="AdamsLair.WinForms" version="1.1.17" />
<dependency id="AdamsLair.WinForms.PopupControl" version="1.0.1" />
</group>
</dependencies>
<references>
<reference file="DualityEditor.exe" />
</references>
</metadata>
<files>
<file src="..\Output\DualityEditor.exe" target="lib\net45" />
<file src="..\Output\DualityEditor.exe.config" target="lib\net45" />
<file src="..\Output\DualityEditor.pdb" target="lib\net45" />
<file src="..\Output\DualityEditor.xml" target="lib\net45" />
<file src="..\Output\DualityUpdater.exe" target="lib\net45" />
<file src="..\Output\VistaBridgeLibrary.dll" target="lib\net45" />
<file src="..\Output\Windows7.DesktopIntegration.dll" target="lib\net45" />
<file src="..\Output\DualityEditor.exe" target="lib\net472" />
<file src="..\Output\DualityEditor.exe.config" target="lib\net472" />
<file src="..\Output\DualityEditor.pdb" target="lib\net472" />
<file src="..\Output\DualityEditor.xml" target="lib\net472" />
<file src="..\Output\DualityUpdater.exe" target="lib\net472" />
<file src="..\Output\VistaBridgeLibrary.dll" target="lib\net472" />
<file src="..\Output\Windows7.DesktopIntegration.dll" target="lib\net472" />
</files>
</package>
</package>
15 changes: 8 additions & 7 deletions Build/NuGetPackageSpecs/Duality.Launcher.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@
<summary>The default launcher application for Duality games.</summary>
<description>The default launcher application for Duality games.</description>
<tags>Duality Launcher</tags>
<releaseNotes>Patch Version Update
</releaseNotes>
<releaseNotes>Patch Version Update</releaseNotes>
<dependencies>
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
<group targetFramework="net472">
<dependency id="AdamsLair.Duality" version="4.0.0-alpha" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\Output\DualityLauncher.exe" target="lib\net45" />
<file src="..\Output\DualityLauncher.exe.config" target="lib\net45" />
<file src="..\Output\DualityLauncher.pdb" target="lib\net45" />
<file src="..\Output\DualityLauncher.exe" target="lib\net472" />
<file src="..\Output\DualityLauncher.exe.config" target="lib\net472" />
<file src="..\Output\DualityLauncher.pdb" target="lib\net472" />
</files>
</package>
</package>
Loading