Merge branch 'feature/net6.0-update'

Martenfur · Sep 14, 2022 · 9a99b87 · 9a99b87
2 parents ad510e6 + 21cfe71
commit 9a99b87
Show file tree

Hide file tree

Showing 14 changed files with 116 additions and 85 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright © 2021 Chai Foxes
+Copyright © 2022 Chai Foxes
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/...ontent/Externsions/SampleWatchImporter.cs → ...Content/Extensions/SampleWatchImporter.cs b/...ontent/Externsions/SampleWatchImporter.cs → ...Content/Extensions/SampleWatchImporter.cs
diff --git a/Nopipeline.Sample/Nopipeline.Sample.Content/Nopipeline.Sample.Content.csproj b/Nopipeline.Sample/Nopipeline.Sample.Content/Nopipeline.Sample.Content.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="MonoGame.Framework.Content.Pipeline" Version="3.8.0.1641">
+		<PackageReference Include="MonoGame.Framework.Content.Pipeline" Version="3.8.1.303">
 			<PrivateAssets>All</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
+		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303">
 			<PrivateAssets>All</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>

diff --git a/Nopipeline.Sample/Nopipeline.Sample.DX/.config/dotnet-tools.json b/Nopipeline.Sample/Nopipeline.Sample.DX/.config/dotnet-tools.json
@@ -0,0 +1,15 @@
+{
+	"version": 1,
+	"isRoot": true,
+	"tools":
+	{
+		"dotnet-mgcb":
+		{
+			"version": "3.8.1.303",
+			"commands":
+			[
+				"mgcb"
+			]
+		}
+	}
+}
diff --git a/Nopipeline.Sample/Nopipeline.Sample.DX/Nopipeline.Sample.DX.csproj b/Nopipeline.Sample/Nopipeline.Sample.DX/Nopipeline.Sample.DX.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net6.0-windows</TargetFramework>
 		<PublishReadyToRun>false</PublishReadyToRun>
 		<TieredCompilation>false</TieredCompilation>
 		<UseWindowsForms>true</UseWindowsForms>
@@ -18,12 +18,15 @@
 		<None Remove="Content\bin\**" />
 		<None Remove="Content\obj\**" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Content Include=".config\dotnet-tools.json" />
+	</ItemGroup>
 	<ItemGroup>
 		<TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
-		<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
+		<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.1.303" />
+		<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
 		<PackageReference Include="Nopipeline.Task" Version="$(Version)" />
 	</ItemGroup>
 	<ItemGroup>

diff --git a/Nopipeline.Sample/Nopipeline.Sample.GL/.config/dotnet-tools.json b/Nopipeline.Sample/Nopipeline.Sample.GL/.config/dotnet-tools.json
@@ -0,0 +1,15 @@
+{
+	"version": 1,
+	"isRoot": true,
+	"tools":
+	{
+		"dotnet-mgcb":
+		{
+			"version": "3.8.1.303",
+			"commands":
+			[
+				"mgcb"
+			]
+		}
+	}
+}
diff --git a/Nopipeline.Sample/Nopipeline.Sample.GL/Nopipeline.Sample.GL.csproj b/Nopipeline.Sample/Nopipeline.Sample.GL/Nopipeline.Sample.GL.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<PublishReadyToRun>false</PublishReadyToRun>
 		<TieredCompilation>false</TieredCompilation>
 	</PropertyGroup>
@@ -21,6 +21,9 @@
 		<None Remove="Icon.ico" />
 		<None Remove="Icon.bmp" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Content Include=".config\dotnet-tools.json" />
+	</ItemGroup>
 	<ItemGroup>
 		<EmbeddedResource Include="Icon.ico" />
 		<EmbeddedResource Include="Icon.bmp" />
@@ -29,8 +32,8 @@
 		<TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
-		<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
+		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
+		<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
 		<PackageReference Include="Nopipeline.Task" Version="$(Version)" />
 	</ItemGroup>
 	<ItemGroup>

diff --git a/Nopipeline.Sample/Nopipeline.Sample.sln b/Nopipeline.Sample/Nopipeline.Sample.sln
diff --git a/Nopipeline.Sample/Nopipeline.Sample/Nopipeline.Sample.csproj b/Nopipeline.Sample/Nopipeline.Sample/Nopipeline.Sample.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
+		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303">
 			<PrivateAssets>All</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>

diff --git a/Nopipeline/Nopipeline.Task/Nopipeline.Task.csproj b/Nopipeline/Nopipeline.Task/Nopipeline.Task.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+		<TargetFrameworks>net6.0</TargetFrameworks>
 		<BaseOutputPath>bin</BaseOutputPath>
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
@@ -12,32 +12,32 @@
 		<PackageIcon>icon.png</PackageIcon>
 	</PropertyGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\Nopipeline\Nopipeline.csproj">
+		<ProjectReference Include="..\Nopipeline\Nopipeline.csproj">
 			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 			<AppReference>true</AppReference>
 		</ProjectReference>
 	</ItemGroup>
-	
+
 	<ItemGroup>
 		<None Update="AppReference.targets">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<Content Include="Nopipeline.Task.targets" PackagePath="build" />
 		<None Include="..\..\LICENSE.md">
-		  <Pack>True</Pack>
-		  <PackagePath></PackagePath>
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
 		</None>
 		<None Include="..\..\pics\icon.png">
-		  <Pack>True</Pack>
-		  <PackagePath></PackagePath>
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
 		</None>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 	<Import Project="AppReference.targets" />
-	
+
 </Project>
diff --git a/Nopipeline/Nopipeline.Task/Nopipeline.Task.targets b/Nopipeline/Nopipeline.Task/Nopipeline.Task.targets
@@ -6,11 +6,11 @@
 
 	<Target Name="Nopipeline">
 		<Exec 
-			Command="dotnet &quot;$(MSBuildThisFileDirectory)/../tools/netcoreapp3.1/any/npl.dll&quot; &quot;%(NPLContentReferences.FullPath)&quot;" 
+			Command="dotnet &quot;$(MSBuildThisFileDirectory)/../tools/net6.0/any/npl.dll&quot; &quot;%(NPLContentReferences.FullPath)&quot;" 
 			Condition="'%(NPLContentReferences.FullPath)' != ''"
 		/>
 		<Exec 
-			Command="dotnet &quot;$(MSBuildThisFileDirectory)/../tools/netcoreapp3.1/any/npl.dll&quot; &quot;%(MGCBContentReferences.FullPath)&quot;" 
+			Command="dotnet &quot;$(MSBuildThisFileDirectory)/../tools/net6.0/any/npl.dll&quot; &quot;%(MGCBContentReferences.FullPath)&quot;" 
 			Condition="'%(MGCBContentReferences.FullPath)' != ''"
 		/>
 	</Target>

diff --git a/Nopipeline/Nopipeline.sln b/Nopipeline/Nopipeline.sln
@@ -1,11 +1,28 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30320.27
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nopipeline", "Nopipeline\Nopipeline.csproj", "{126869BE-CEE7-4D02-870B-D9AA9E29845D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nopipeline.Task", "Nopipeline.Task\Nopipeline.Task.csproj", "{74FF963A-E14D-4539-ADFF-C181BC4584A5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nopipeline.Task", "Nopipeline.Task\Nopipeline.Task.csproj", "{74FF963A-E14D-4539-ADFF-C181BC4584A5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{CF9BDCC6-A0D6-4696-AE50-8E3DF96C19FE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nopipeline.Sample.GL", "..\Nopipeline.Sample\Nopipeline.Sample.GL\Nopipeline.Sample.GL.csproj", "{ABCC134B-BBAD-45B2-9CED-41C6A890B566}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nopipeline.Sample.DX", "..\Nopipeline.Sample\Nopipeline.Sample.DX\Nopipeline.Sample.DX.csproj", "{0D73F677-F001-4293-9928-23484942CAD6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nopipeline.Sample", "..\Nopipeline.Sample\Nopipeline.Sample\Nopipeline.Sample.csproj", "{67A1E5B3-9D8B-463D-8FFB-E89ECDDF9B16}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nopipeline.Sample.Content", "..\Nopipeline.Sample\Nopipeline.Sample.Content\Nopipeline.Sample.Content.csproj", "{0ABA3B05-C49A-4BD0-B56E-26C6BF1E9D69}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{9454C44F-E170-4EAE-AD12-93D91F360B29}"
+	ProjectSection(SolutionItems) = preProject
+		..\Directory.Build.props = ..\Directory.Build.props
+		..\Nuget.props = ..\Nuget.props
+		..\README.md = ..\README.md
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,10 +38,32 @@ Global
 		{74FF963A-E14D-4539-ADFF-C181BC4584A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74FF963A-E14D-4539-ADFF-C181BC4584A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74FF963A-E14D-4539-ADFF-C181BC4584A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABCC134B-BBAD-45B2-9CED-41C6A890B566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABCC134B-BBAD-45B2-9CED-41C6A890B566}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABCC134B-BBAD-45B2-9CED-41C6A890B566}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABCC134B-BBAD-45B2-9CED-41C6A890B566}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D73F677-F001-4293-9928-23484942CAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D73F677-F001-4293-9928-23484942CAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D73F677-F001-4293-9928-23484942CAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D73F677-F001-4293-9928-23484942CAD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67A1E5B3-9D8B-463D-8FFB-E89ECDDF9B16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67A1E5B3-9D8B-463D-8FFB-E89ECDDF9B16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67A1E5B3-9D8B-463D-8FFB-E89ECDDF9B16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67A1E5B3-9D8B-463D-8FFB-E89ECDDF9B16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0ABA3B05-C49A-4BD0-B56E-26C6BF1E9D69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0ABA3B05-C49A-4BD0-B56E-26C6BF1E9D69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0ABA3B05-C49A-4BD0-B56E-26C6BF1E9D69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0ABA3B05-C49A-4BD0-B56E-26C6BF1E9D69}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{ABCC134B-BBAD-45B2-9CED-41C6A890B566} = {CF9BDCC6-A0D6-4696-AE50-8E3DF96C19FE}
+		{0D73F677-F001-4293-9928-23484942CAD6} = {CF9BDCC6-A0D6-4696-AE50-8E3DF96C19FE}
+		{67A1E5B3-9D8B-463D-8FFB-E89ECDDF9B16} = {CF9BDCC6-A0D6-4696-AE50-8E3DF96C19FE}
+		{0ABA3B05-C49A-4BD0-B56E-26C6BF1E9D69} = {CF9BDCC6-A0D6-4696-AE50-8E3DF96C19FE}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DE77769A-2D97-40AD-8F62-9C8471F81EEC}
 	EndGlobalSection

diff --git a/Nopipeline/Nopipeline/Nopipeline.csproj b/Nopipeline/Nopipeline/Nopipeline.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFrameworks>net6.0</TargetFrameworks>
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>npl</ToolCommandName>
 		<PackageId>dotnet-npl</PackageId>
 		<AssemblyName>npl</AssemblyName>
 		<UseAppHost>true</UseAppHost>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-  </PropertyGroup>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="EmptyContent.mgcb" />
-    <EmbeddedResource Include="EmptyContent.npl" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="EmptyContent.mgcb" />
+		<EmbeddedResource Include="EmptyContent.npl" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+	</ItemGroup>
 </Project>
diff --git a/Nuget.props b/Nuget.props
@@ -1,6 +1,6 @@
-<Project>
+<Project>
 	<PropertyGroup>
-		<Version>2.1.5</Version>
+		<Version>2.2.0</Version>
 		<Description>A Content Pipeline addon for Monogame which fully replaces Pipeline UI.</Description>
 		<Authors>Martenfur</Authors>
 		<Company>Chai Foxes</Company>
@@ -9,4 +9,4 @@
 		<RepositoryUrl>https://github.com/Martenfur/Nopipeline</RepositoryUrl>
 		<PackageProjectUrl>https://github.com/Martenfur/Nopipeline</PackageProjectUrl>
 	</PropertyGroup>
-</Project>
+</Project>