libraries - dotnet7 updates #146

ProfessionalCSharp · Nov 15, 2022 · 66f7c6d · 66f7c6d
1 parent 58d221e
commit 66f7c6d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 25 deletions.
diff --git a/2_Libs/Libraries/CreateNuGet/ConsoleApp/ConsoleApp.csproj b/2_Libs/Libraries/CreateNuGet/ConsoleApp/ConsoleApp.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/2_Libs/Libraries/CreateNuGet/SampleLib/Demo.cs b/2_Libs/Libraries/CreateNuGet/SampleLib/Demo.cs
@@ -6,13 +6,13 @@ namespace SampleLib;
 public class Demo
 {
 #if NETSTANDARD20
-        private static string s_info = ".NET Standard 2.0";
-#elif NET5_0
-    private static string s_info = ".NET 5.0";
+    private readonly static string s_info = ".NET Standard 2.0";
 #elif NET6_0
-    private static string s_info = ".NET 6.0";
+    private readonly static string s_info = ".NET 6.0";
+#elif NET7_0
+    private readonly static string s_info = ".NET 7.0";
 #else
-        private static string s_info = "Unknown";
+    private readonly static string s_info = "Unknown";
 #endif
 
     public static string Show() => s_info;

diff --git a/2_Libs/Libraries/CreateNuGet/SampleLib/SampleLib.csproj b/2_Libs/Libraries/CreateNuGet/SampleLib/SampleLib.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -18,9 +18,9 @@
     <RepositoryType>Git</RepositoryType>
     <PackageTags>CSharp; .NET Core; NuGet</PackageTags>
     <PackageReleaseNotes>Sample for Professional C# and .NET - 2021 Edition</PackageReleaseNotes>
-    <Version>6.0.1</Version>
-    <AssemblyVersion>6.0.1.0</AssemblyVersion>
-    <ProductVersion>6.0</ProductVersion>
+    <Version>7.0.1</Version>
+    <AssemblyVersion>7.0.1.0</AssemblyVersion>
+    <ProductVersion>7.0</ProductVersion>
   </PropertyGroup>
 
   <!-- 
@@ -32,24 +32,20 @@
     <DefineConstants>NETSTANDARD20</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
-    <DefineConstants>NET50</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
     <DefineConstants>NET60</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
+    <DefineConstants>NET70</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Text.Json" Version="5.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
+    <PackageReference Include="System.Text.Json" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/2_Libs/Libraries/UsingLibs/ConsoleApp/ConsoleApp.csproj b/2_Libs/Libraries/UsingLibs/ConsoleApp/ConsoleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
   </ItemGroup>
 
 

diff --git a/2_Libs/Libraries/UsingLibs/SampleLib/SampleLib.csproj b/2_Libs/Libraries/UsingLibs/SampleLib/SampleLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>