Net 7 (#4)

mrpmorris · Jan 2, 2023 · 8163d20 · 8163d20
1 parent b004744
commit 8163d20
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/Docs/Releases.md b/Docs/Releases.md
@@ -5,6 +5,10 @@
 
 ## Releases
 
+### New in 2.0
+- Add support for .NET 7
+- Remove support for .NET frameworks no longer supported by Microsoft
+
 ### New in 1.1.0
 - `ForEachWithIndex`
 

diff --git a/Source/Lib/Directory.Build.props b/Source/Lib/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<LangVersion>10</LangVersion>
-		<Version>1.1.0</Version>
+		<Version>2.0.0</Version>
 
 		<Authors>Peter Morris</Authors>
 		<Company />

diff --git a/Source/Lib/Morris.Blazor.ControlFlow/Morris.Blazor.ControlFlow.csproj b/Source/Lib/Morris.Blazor.ControlFlow/Morris.Blazor.ControlFlow.csproj
@@ -16,21 +16,20 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <None Include="..\..\..\Images\control-flow-logo.png">
-	    <Pack>True</Pack>
-	    <PackagePath>\</PackagePath>
-	  </None>
-	  <None Include="..\..\..\README.md">
-	    <Pack>True</Pack>
-	    <PackagePath>\</PackagePath>
-	  </None>
+		<None Include="..\..\..\Images\control-flow-logo.png">
+			<Pack>True</Pack>
+			<PackagePath>\</PackagePath>
+		</None>
+		<None Include="..\..\..\README.md">
+			<Pack>True</Pack>
+			<PackagePath>\</PackagePath>
+		</None>
 	</ItemGroup>
 
 
 	<ItemGroup>
 		<PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
-		<PackageReference Condition="'$(TargetFramework)' == 'net5.0'" Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0" />
-		<PackageReference Condition="'$(TargetFramework)' != 'net6.0' AND '$(TargetFramework)' != 'net5.0'" Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
+		<PackageReference Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/Source/Morris.Blazor.ControlFlow.sln b/Source/Morris.Blazor.ControlFlow.sln
@@ -23,6 +23,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{CE4D64CF-C
 		..\Docs\Releases.md = ..\Docs\Releases.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{33158399-9AA3-49EE-988C-10FCA83F5B85}"
+	ProjectSection(SolutionItems) = preProject
+		Lib\Directory.Build.props = Lib\Directory.Build.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -46,6 +51,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{5B499DA3-0DB1-48A5-B8E5-3E0B04F53EB7} = {33158399-9AA3-49EE-988C-10FCA83F5B85}
 		{E438D699-B285-4F8A-8087-095765599DFA} = {77B146CD-F531-47CE-A163-2CB4136B2BA9}
 		{06B9F71D-5203-4CDD-90A5-627BACFADA75} = {77B146CD-F531-47CE-A163-2CB4136B2BA9}
 	EndGlobalSection

diff --git a/Source/Tutorials/ForEachExample/ForEachExample.csproj b/Source/Tutorials/ForEachExample/ForEachExample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Source/Tutorials/IfThenElseSample/IfThenElseSample.csproj b/Source/Tutorials/IfThenElseSample/IfThenElseSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>