Drop netcoreapp3.1, add net7.0 support

Resolves Azure#32596. With netcoreapp3.1 falling out of support soon, we're upgrading to net7.0, net6.0, and, on Windows, net461.
heaths · Jan 10, 2023 · f5b9c84 · f5b9c84
1 parent 54e1b1f
commit f5b9c84
Show file tree

Hide file tree

Showing 35 changed files with 111 additions and 93 deletions.
diff --git a/.vsconfig b/.vsconfig
@@ -0,0 +1,18 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Workload.ManagedDesktop",
+    "Microsoft.Net.ComponentGroup.4.6.2-4.7.1.DeveloperTools",
+    "Microsoft.Net.Component.4.7.2.TargetingPack",
+    "Microsoft.Net.Component.4.6.1.TargetingPack",
+    "Microsoft.Net.Component.4.8.SDK",
+    "Microsoft.Component.MSBuild",
+    "Microsoft.NetCore.Component.DevelopmentTools",
+    "Microsoft.NetCore.Component.Runtime.7.0",
+    "Microsoft.NetCore.Component.Runtime.6.0",
+    "Microsoft.NetCore.Component.Runtime.5.0",
+    "Microsoft.NetCore.Component.Runtime.3.1",
+    "Microsoft.NetCore.Component.SDK",
+    "Microsoft.VisualStudio.Component.Git"
+  ]
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,8 +8,8 @@
 
 - Install Visual Studio 2022 (Community or higher) and make sure you have the latest updates (https://www.visualstudio.com/).
   - Need at least .NET Framework 4.6.1 and 4.7 development tools
-- Install the **.NET Core cross-platform development** workloads in VisualStudio
-- Install **.NET Core 6.0.100 SDK** for your specific platform. (or a higher version within the 6.0.*** band)  (https://dotnet.microsoft.com/download/dotnet-core/6.0)
+- Install the **.NET cross-platform development** workloads in VisualStudio
+- Install **.NET 7.0.100 SDK** for your specific platform. (or a higher version within the 6.0.*** band)  (https://dotnet.microsoft.com/download/dotnet-core/7.0)
 - Install the latest version of git (https://git-scm.com/downloads)
 - Install [PowerShell](https://docs.microsoft.com/powershell/scripting/install/installing-powershell), version 6 or higher, if you plan to make public API changes or are working with generated code snippets.
 - Install [NodeJS](https://nodejs.org/) (16.x.x) if you plan to use [C# code generation](https://github.com/Azure/autorest.csharp).
@@ -182,7 +182,7 @@ In some cases, you might want to test against the latest versions of the client
 
 If you make public API changes or additions, the `eng\scripts\Export-API.ps1` script has to be run to update public API listings. This generates a file in the library's directory similar to the example found in `sdk\template\Azure.Template\api\Azure.Template.netstandard2.0.cs`.
 
-Running the script for a project in `sdk\tables` would look like this: 
+Running the script for a project in `sdk\tables` would look like this:
 ```
 eng\scripts\Export-API.ps1 tables
 ```
@@ -191,7 +191,7 @@ eng\scripts\Export-API.ps1 tables
 If the specific client library has sample snippets in markdown format, they were most likely created with help of the `eng\scripts\Update-Snippets.ps1` script.
 Any changes made to the snippet markdown should be done via updating the corresponding C# snippet code and subsequently running the script.
 
-Running the script for a project, for example in `sdk\keyvault`, would look like this: 
+Running the script for a project, for example in `sdk\keyvault`, would look like this:
 ```
 eng\scripts\Update-Snippets.ps1 keyvault
 ```
@@ -211,13 +211,13 @@ string ignored = "this code will not appear in the snippet markdown";
 
 #endregion
 ```
- will be mapped to any markdown file with a corresponding code region in the format below where the snippet names match: 
+ will be mapped to any markdown file with a corresponding code region in the format below where the snippet names match:
 
 **\`\`\`C# Snippet:\<snippetName>**
 
 **\`\`\`**
 
-See the following example of a [snippet C# file](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/tests/Samples/Sample01_HelloWorld.cs) and a [snippet markdown file](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample01a_HelloWorld.md). 
+See the following example of a [snippet C# file](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/tests/Samples/Sample01_HelloWorld.cs) and a [snippet markdown file](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/search/Azure.Search.Documents/samples/Sample01a_HelloWorld.md).
 Note that snippet names need to be globally unique under a given service directory.
 
 Snippets also can be integrated into XML doc comments. For example:
@@ -238,7 +238,7 @@ For general information about samples, see the [Samples Guidelines](https://azur
 
 ## Updating Source on Build
 You can run `eng\scripts\Export-API.ps1` and `eng\scripts\Update-Snippets.ps1` simultaneously as part of the build by setting as true either:
-1. The property `UpdateSourceOnBuild` 
+1. The property `UpdateSourceOnBuild`
 2. The Environment variable `AZURE_DEV_UPDATESOURCESONBUILD=true`
 
 e.g.
@@ -329,7 +329,7 @@ As you can see in the example below, we want to use the `Azure.Data.Tables` vers
 
 ## Preparing a new library release
 
-To prepare a package for release you should make use of `.\eng\common\scripts\Prepare-Release.ps1` script passing it appropriate arguments for the package intended for release. This script will correctly update the package version and changelog in the repo as well as update the DevOps release work items for that release. 
+To prepare a package for release you should make use of `.\eng\common\scripts\Prepare-Release.ps1` script passing it appropriate arguments for the package intended for release. This script will correctly update the package version and changelog in the repo as well as update the DevOps release work items for that release.
 
 ```
 .\eng\common\scripts\Prepare-Release.ps1 <PackageName> [<ServiceDirectory>] [<ReleaseDate>] [-ReleaseTrackingOnly]
@@ -419,7 +419,7 @@ See [Data Plane Quick Start Tutorial](https://github.com/Azure/azure-sdk-for-net
        {
            private const ServiceVersion Latest = ServiceVersion.V2019_06_01;
            internal static StorageManagementClientOptions Default { get; } = new StorageManagementClientOptions();
-   
+
            public StorageManagementClientOptions(ServiceVersion serviceVersion = Latest)
            {
                VersionString = serviceVersion switch
@@ -428,9 +428,9 @@ See [Data Plane Quick Start Tutorial](https://github.com/Azure/azure-sdk-for-net
                    _ => throw new ArgumentOutOfRangeException(nameof(serviceVersion))
                };
            }
-   
+
            internal string VersionString { get; }
-   
+
            public enum ServiceVersion
            {
    #pragma warning disable CA1707 // Identifiers should not contain underscores
@@ -449,7 +449,7 @@ See [Data Plane Quick Start Tutorial](https://github.com/Azure/azure-sdk-for-net
            public FileSharesClient(string subscriptionId, TokenCredential tokenCredential): this(subscriptionId, tokenCredential, StorageManagementClientOptions.Default)
            {
            }
-   
+
            public FileSharesClient(string subscriptionId, TokenCredential tokenCredential, StorageManagementClientOptions options):
                this(new ClientDiagnostics(options), ManagementClientPipeline.Build(options, tokenCredential), subscriptionId, apiVersion: options.VersionString)
            {
@@ -520,8 +520,8 @@ Once all of the above steps are met, the following process will be followed:
 
 |                          | Linux (Ubuntu 20.04) | MacOS 10.15 | Windows Server 2019 |
 | ------------------------ | :------------------: | :---------: | :-----------------: |
-| **.NET 6**               | x                    | x           | x                   |
-| **.NET Core 3.1**        | x                    | x           | x                   |
+| **.NET 7.0**             | x                    | x           | x                   |
+| **.NET 6.0**             | x                    | x           | x                   |
 | **.NET Framework 4.6.1** |                      |             | x                   |
 
 ### Issues with Generated Code

diff --git a/common/SmokeTests/SmokeTest/SmokeTest.csproj b/common/SmokeTests/SmokeTest/SmokeTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461;net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net461</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
@@ -38,7 +38,7 @@
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1'">
+  <ItemGroup Condition="$([MSBuild]::VersionLessThan('$(TargetFrameworkVersion)', '3.1'))">
     <!-- This package supports netcoreapp3.1 -->
     <PackageReference Remove="Microsoft.Azure.WebPubSub.AspNetCore" />
   </ItemGroup>

diff --git a/doc/ApiDocGeneration/assets/docgen.csproj b/doc/ApiDocGeneration/assets/docgen.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <Description>This is a dummy project used to restore nuget packages used for doc generation</Description>
     <AssemblyTitle>Doc generation Packages</AssemblyTitle>
   </PropertyGroup>

diff --git a/doc/dev/Using-Mock-Test-Generation.md b/doc/dev/Using-Mock-Test-Generation.md
@@ -21,7 +21,7 @@ Below is a sample for mock testcase:
 
 <div id="generate-mock-test"/>
 
-# Generate Mock Test 
+# Generate Mock Test
 The Mgmt mock tests can be generated by below steps:
 
 1. Go to folder Azure.ResourceManager.xxx\tests
@@ -56,7 +56,7 @@ The Mgmt mock tests can be generated by below steps:
     [USE autorest]
     ~~~
     // clone autorest.csharp and build
-    > autorest --use=PATH_TO_AUTOREST.CSHARP\artifacts\bin\AutoRest.CSharp\Debug\netcoreapp3.1 autorest.tests.md --testmodeler={} --debug
+    > autorest --use=PATH_TO_AUTOREST.CSHARP\artifacts\bin\AutoRest.CSharp\Debug\net6.0 autorest.tests.md --testmodeler={} --debug
     ~~~
 
     [or USE dotnet target]

diff --git a/eng/Directory.Build.Common.props b/eng/Directory.Build.Common.props
@@ -123,7 +123,7 @@
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsSamplesProject)' == 'true' or '$(IsPerfProject)' == 'true' or '$(IsStressProject)' == 'true'">
     <IsPackable>false</IsPackable>
     <!-- List newest targets first so that recordings are made with latest, running tests from editor runs latest, etc. -->
-    <RequiredTargetFrameworks>net6.0;netcoreapp3.1</RequiredTargetFrameworks>
+    <RequiredTargetFrameworks>net7.0;net6.0</RequiredTargetFrameworks>
     <!-- Also test net461 on Windows. -->
     <RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(RequiredTargetFrameworks);net461</RequiredTargetFrameworks>
   </PropertyGroup>

diff --git a/eng/mgmt/AzSdk.test.reference.props b/eng/mgmt/AzSdk.test.reference.props
@@ -1,6 +1,6 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+		<TargetFrameworks>net6.0</TargetFrameworks>
 	</PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(RepoEngPath)\..\sdk\mgmtcommon\TestFramework\Microsoft.Azure.Test.HttpRecorder\Microsoft.Azure.Test.HttpRecorder.csproj" />
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup> 
-     <Compile Include="$(RepoEngPath)\mgmt\DisableTestRunParallel.cs" Link="DisableTestRunParallel.cs" /> 
+  <ItemGroup>
+     <Compile Include="$(RepoEngPath)\mgmt\DisableTestRunParallel.cs" Link="DisableTestRunParallel.cs" />
   </ItemGroup>
 </Project>
diff --git a/eng/pipelines/templates/jobs/smoke.tests.yml b/eng/pipelines/templates/jobs/smoke.tests.yml
@@ -51,14 +51,14 @@ jobs:
           Pool: "azsdk-pool-mms-win-2022-general"
           OSVmImage: "MMS2022"
           TestTargetFramework: net461
-        Windows_NetCore:
-          Pool: "azsdk-pool-mms-ubuntu-2004-general"
-          OSVmImage: "MMSUbuntu20.04"
-          TestTargetFramework: netcoreapp3.1
         Windows_Net60:
           Pool: "azsdk-pool-mms-win-2022-general"
           OSVmImage: "MMS2022"
           TestTargetFramework: net6.0
+        Windows_Net70:
+          Pool: "azsdk-pool-mms-ubuntu-2004-general"
+          OSVmImage: "MMSUbuntu20.04"
+          TestTargetFramework: net7.0
     pool:
       name: $(Pool)
       vmImage: $(OSVmImage)

diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
@@ -5,35 +5,35 @@
   },
   "matrix": {
     "Agent": {
-      "Ubuntu-20.04_NETCore3.1": {
+      "Ubuntu-20.04_NET6.0": {
         "OSVmImage": "MMSUbuntu20.04",
         "Pool": "azsdk-pool-mms-ubuntu-2004-general",
-        "TestTargetFramework": "netcoreapp3.1"
+        "TestTargetFramework": "net6.0"
       },
-      "Ubuntu-20.04_NET6.0": {
+      "Ubuntu-20.04_NET7.0": {
         "OSVmImage": "MMSUbuntu20.04",
         "Pool": "azsdk-pool-mms-ubuntu-2004-general",
-        "TestTargetFramework": "net6.0"
+        "TestTargetFramework": "net7.0"
       },
-      "windows2022_NET6.0": {
+      "Windows2022_NET461": {
         "OSVmImage": "MMS2022",
         "Pool": "azsdk-pool-mms-win-2022-general",
-        "TestTargetFramework": "net6.0"
+        "TestTargetFramework": "net461"
       },
-      "windows2022_NET461": {
+      "Windows2022_NET7.0": {
         "OSVmImage": "MMS2022",
         "Pool": "azsdk-pool-mms-win-2022-general",
-        "TestTargetFramework": "net461"
+        "TestTargetFramework": "net7.0"
       },
-      "macos-11_NETCore3.1": {
+      "MacOS-11_NET6.0": {
         "OSVmImage": "macos-11",
         "Pool": "Azure Pipelines",
-        "TestTargetFramework": "netcoreapp3.1"
+        "TestTargetFramework": "net6.0"
       },
-      "macos-11_NET6.0": {
+      "MacOS-11_NET7.0": {
         "OSVmImage": "macos-11",
         "Pool": "Azure Pipelines",
-        "TestTargetFramework": "net6.0"
+        "TestTargetFramework": "net7.0"
       }
     },
     "AdditionalTestArguments": [
@@ -48,14 +48,14 @@
   "include": [
     {
       "Agent": {
-        "windows2022": {
+        "Windows2022": {
           "OSVmImage": "MMS2022",
           "Pool": "azsdk-pool-mms-win-2022-general",
-          "TestTargetFramework": "net6.0"
+          "TestTargetFramework": "net7.0"
         }
       },
       "TestMode": {
-        "NET6.0_Coverage_Record": {
+        "NET7.0_Coverage_Record": {
           "SupportsRecording": true,
           "CollectCoverage": true
         }

diff --git a/eng/pipelines/templates/steps/install-dotnet.yml b/eng/pipelines/templates/steps/install-dotnet.yml
@@ -12,20 +12,20 @@ steps:
       msbuildArguments: /p:WorkFolder="$(Agent.WorkFolder)" /p:BuildDirectory="$(Agent.BuildDirectory)"
   # Installation steps need to be uncommented when switching to a newer SDK that's not available on DevOps agents
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK'
+    displayName: 'Use .NET SDK'
     retryCountOnTaskFailure: 3
     inputs:
       useGlobalJson: true
       performMultiLevelLookup: true
   - task: UseDotNet@2
     condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT')) # Windows supports MultiLevelLookup and doesn't need explicit framework installation
-    displayName: 'Use .NET Core 3.1 SDK'
+    displayName: 'Use .NET 6.0 SDK'
     retryCountOnTaskFailure: 3
     inputs:
       # AspNetCore runtime pack can't be installed outside of SDK and we need it for intergation tests
       packageType: sdk
       performMultiLevelLookup: true
-      version: "3.1.x"
+      version: "6.0.x"
   - task: Cache@2
     inputs:
       key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/eng/Packages.Data.props | ${{parameters.NuGetCacheKey}}'

diff --git a/eng/scripts/dependencies/azure-sdk.deps.csproj b/eng/scripts/dependencies/azure-sdk.deps.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <!-- 
-      Loading a dev version of some dependencies causes some downgrade warnings. 
-      This can happen sometimes after releaseing a new version when the version in 
+    <!--
+      Loading a dev version of some dependencies causes some downgrade warnings.
+      This can happen sometimes after releaseing a new version when the version in
       the repo has not yet been updated.
     -->
     <NoWarn>$(NoWarn);NU1605</NoWarn>

diff --git a/global.json b/global.json
@@ -3,7 +3,7 @@
     "Microsoft.Build.Traversal": "3.0.23"
   },
   "sdk": {
-    "version": "6.0.403",
+    "version": "7.0.100",
     "rollForward": "feature"
   }
 }
diff --git a/samples/AppSecretsConfig/AppSecretsConfig.csproj b/samples/AppSecretsConfig/AppSecretsConfig.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>AppSecretsConfig</RootNamespace>
 </PropertyGroup>
 

diff --git a/samples/CloudClipboard/CloudClipboard/CloudClipboard.csproj b/samples/CloudClipboard/CloudClipboard/CloudClipboard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 

diff --git a/samples/linecounter/LineCounter.csproj b/samples/linecounter/LineCounter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>67ca5d37-051b-4ab1-b013-c74a2d4edb76</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>

diff --git a/sdk/appconfiguration/CONTRIBUTING.md b/sdk/appconfiguration/CONTRIBUTING.md
@@ -22,9 +22,9 @@ Before working on a contribution, it would be beneficial to familiarize yourself
 
 These libraries follow the [Azure SDK Design Guidelines for .NET][sdk_design_guidelines_dotnet] and share a number of core features such as HTTP retries, logging, transport protocols, authentication protocols, etc., so that once you learn how to use these features in one client library, you will know how to use them in other client libraries. You can learn about these shared features in the [Azure.Core README][sdk_dotnet_code_readme].
 
-## Public API changes  
+## Public API changes
 
-To update [`Azure.Data.AppConfiguration.netstandard2.0.cs`][azconfig_api] after making changes to the public API, execute [`./eng/scripts/Export-API.ps1`][azconfig_export_api]. 
+To update [`Azure.Data.AppConfiguration.netstandard2.0.cs`][azconfig_api] after making changes to the public API, execute [`./eng/scripts/Export-API.ps1`][azconfig_export_api].
 
 ## Testing
 
@@ -48,7 +48,7 @@ Properly supporting recorded tests does require a few extra considerations. All
 
 The easiest way to run the tests is via Visual Studio's unit test runner.
 
-You can also run tests via the command line using `dotnet test`, but that will run tests for all supported platforms simultaneously and intermingle their output. You can run the tests for just one platform with `dotnet test -f netcoreapp3.1` or `dotnet test -f net461`.
+You can also run tests via the command line using `dotnet test`, but that will run tests for all supported platforms simultaneously and intermingle their output. You can run the tests for just one platform with `dotnet test -f net6.0` or `dotnet test -f net461`.
 
 The recorded tests are run automatically on every pull request. Live tests are run nightly. Contributors with write access can ask Azure DevOps to run the live tests against a pull request by commenting `/azp run net - appconfiguration - tests` in the PR.