Update .NET 7

eaba · eaba · commit 9c9c363d06de · 2022-12-24T11:44:06.000+01:00
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -39,17 +39,14 @@ jobs:
     name: windows-latest
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.*
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.*
+          dotnet-version: 7.0.*
       - name: Cache .nuke/temp, ~/.nuget/packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             .nuke/temp
@@ -63,17 +60,14 @@ jobs:
     name: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.*
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.*
+          dotnet-version: 7.0.*
       - name: Cache .nuke/temp, ~/.nuget/packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             .nuke/temp
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -27,17 +27,14 @@ jobs:
     name: windows-latest
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.*
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.*
+          dotnet-version: 7.0.*
       - name: Cache .nuke/temp, ~/.nuget/packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             .nuke/temp
diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
@@ -31,17 +31,14 @@ jobs:
     name: windows-latest
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.*
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.*
+          dotnet-version: 7.0.*
       - name: Cache .nuke/temp, ~/.nuget/packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             .nuke/temp
@@ -55,17 +52,14 @@ jobs:
     name: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.*
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.*
+          dotnet-version: 7.0.*
       - name: Cache .nuke/temp, ~/.nuget/packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             .nuke/temp
diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -1,9 +1,9 @@
 // <auto-generated/>
             using System.Reflection;
-            [assembly: AssemblyMetadataAttribute("githash","29d0c82d7c912c011260c22915da85b65c7c65e0")]
+            [assembly: AssemblyMetadataAttribute("githash","11785b79605980d63637315e90346f303c54a603")]
             namespace System {
                 internal static class AssemblyVersionInformation {
-                    internal const System.String AssemblyMetadata_githash = "29d0c82d7c912c011260c22915da85b65c7c65e0";
+                    internal const System.String AssemblyMetadata_githash = "11785b79605980d63637315e90346f303c54a603";
                 }
             }
             
diff --git a/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj b/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj
@@ -1,20 +1,20 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-      <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+      <TargetFrameworks>net7.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="apache.avro" Version="1.11.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="apache.avro" Version="1.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/AvroSchemaGenerator.Tests/GetSchemaTest.cs b/AvroSchemaGenerator.Tests/GetSchemaTest.cs
@@ -406,7 +406,7 @@ public void TestNestedCustomDefinition()
         [Fact]
         public void TestFailedCustomDefinition()
         {
-            Assert.Throws(typeof(ArgumentException), () => typeof(FailedCustomDefinitionTest).GetSchema());
+            Assert.Throws<ArgumentException>(() => typeof(FailedCustomDefinitionTest).GetSchema());
         }
 
         private sbyte[] Write<T>(T message, ReflectWriter<T> writer)
diff --git a/SchemaGenerator/AvroSchemaGenerator.csproj b/SchemaGenerator/AvroSchemaGenerator.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <PackageProjectUrl>https://github.com/eaba/SchemaGenerator</PackageProjectUrl>
     <RepositoryUrl>https://github.com/eaba/SchemaGenerator</RepositoryUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="6.0.5" />
+    <PackageReference Include="System.Text.Json" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs
@@ -61,7 +61,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC
         try
         {
             var newSteps = new List<GitHubActionsStep>(job.Steps);
-            foreach (var version in new[] { "6.0.*", "5.0.*" })
+            foreach (var version in new[] { "7.0.*" })
             {
                 newSteps.Insert(1, new GitHubActionsSetupDotNetStep
                 {
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="6.1.2" />
+    <PackageReference Include="Nuke.Common" Version="6.3.0" />
     <PackageDownload Include="GitVersion.Tool" Version="[5.8.1]" />
   </ItemGroup>
 
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "7.0.101",
     "rollForward": "latestMinor"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`// <auto-generated/>`
`2`	`2`	`using System.Reflection;`
`3`		`- [assembly: AssemblyMetadataAttribute("githash","29d0c82d7c912c011260c22915da85b65c7c65e0")]`
	`3`	`+ [assembly: AssemblyMetadataAttribute("githash","11785b79605980d63637315e90346f303c54a603")]`
`4`	`4`	`namespace System {`
`5`	`5`	`internal static class AssemblyVersionInformation {`
`6`		`- internal const System.String AssemblyMetadata_githash = "29d0c82d7c912c011260c22915da85b65c7c65e0";`
	`6`	`+ internal const System.String AssemblyMetadata_githash = "11785b79605980d63637315e90346f303c54a603";`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ public void TestNestedCustomDefinition()`
`406`	`406`	`[Fact]`
`407`	`407`	`public void TestFailedCustomDefinition()`
`408`	`408`	`{`
`409`		`- Assert.Throws(typeof(ArgumentException), () => typeof(FailedCustomDefinitionTest).GetSchema());`
	`409`	`+ Assert.Throws<ArgumentException>(() => typeof(FailedCustomDefinitionTest).GetSchema());`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`private sbyte[] Write<T>(T message, ReflectWriter<T> writer)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC`
`61`	`61`	`try`
`62`	`62`	`{`
`63`	`63`	`var newSteps = new List<GitHubActionsStep>(job.Steps);`
`64`		`- foreach (var version in new[] { "6.0.", "5.0." })`
	`64`	`+ foreach (var version in new[] { "7.0.*" })`
`65`	`65`	`{`
`66`	`66`	`newSteps.Insert(1, new GitHubActionsSetupDotNetStep`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "6.0.100",`
	`3`	`+ "version": "7.0.101",`
`4`	`4`	`"rollForward": "latestMinor"`
`5`	`5`	`}`
`6`	`6`	`}`