Merge branch 'feature/v3' of https://github.com/Azure/autorest.csharp …

…into text3816

eng/GenerateAndExecuteMockTest.ps1

@@ -211,7 +211,7 @@ function  MockTestInit {
             Write-Host "Autorest build fail."
             exit
         }
-        $autorestVersion = Join-Path $projRoot "\artifacts\bin\AutoRest.CSharp\Debug\net6.0"
+        $autorestVersion = Join-Path $projRoot "\artifacts\bin\AutoRest.CSharp\Debug\net7.0"
 
         # Clone Azure/azure-rest-api-specs and get latest commitId
         & git clone https://github.com/Azure/azure-rest-api-specs.git $projRoot\azure-rest-api-specs

eng/Generation.psm1

@@ -85,7 +85,7 @@ function Invoke-TypeSpec($baseOutput, $projectName, $mainFile, $arguments="", $s
         $repoRootPath = Join-Path $PSScriptRoot ".."
         $repoRootPath = Resolve-Path -Path $repoRootPath
         Push-Location $repoRootPath
-        $autorestCsharpBinPath = Join-Path $repoRootPath "artifacts/bin/AutoRest.CSharp/Debug/net6.0/AutoRest.CSharp.dll"
+        $autorestCsharpBinPath = Join-Path $repoRootPath "artifacts/bin/AutoRest.CSharp/Debug/net7.0/AutoRest.CSharp.dll"
         Try
         {
             $typespecFileName = $mainFile ? $mainFile : "$baseOutput/$projectName.tsp"

eng/PackArtifacts.ps1

@@ -25,7 +25,7 @@ finally {
 }
 
 # Pack autorest.csharp npm package "@autorest/csharp"
-$artifactsPath = Resolve-Path (Join-Path $repoRoot '/artifacts/bin/AutoRest.CSharp/Release/net6.0/')
+$artifactsPath = Resolve-Path (Join-Path $repoRoot '/artifacts/bin/AutoRest.CSharp/Release/net7.0/')
 Push-Location $artifactsPath
 try {
     npm version --no-git-tag-version $alphaVersion | Out-Null;

eng/pipelines/build.yml

@@ -111,7 +111,7 @@ stages:
           - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
             - pwsh: >
                 ./eng/PublishRelease.ps1
-                -AutorestArtifactDirectory ./artifacts/bin/AutoRest.CSharp/Release/net6.0/
+                -AutorestArtifactDirectory ./artifacts/bin/AutoRest.CSharp/Release/net7.0/
                 -CoverageDirectory ./artifacts/coverage
                 -TypeSpecEmitterDirectory ./src/TypeSpec.Extension/Emitter.Csharp
                 -GitHubToken $(azuresdk-github-pat)

eng/pipelines/sdk-update.yml

@@ -118,7 +118,7 @@ stages:
             displayName: 'Publish @autorest/csharp'
             inputs:
               command: 'publish'
-              workingDir: '$(Build.SourcesDirectory)/autorest.csharp/artifacts/bin/AutoRest.CSharp/Release/net6.0'
+              workingDir: '$(Build.SourcesDirectory)/autorest.csharp/artifacts/bin/AutoRest.CSharp/Release/net7.0'
               publishRegistry: 'useFeed'
               publishFeed: '29ec6040-b234-4e31-b139-33dc4287b756/05efbea8-6e52-49dd-ad3d-ac3d4aa65036'
           - pwsh: ./eng/PackEmitter.ps1 -BuildNumber $(Build.BuildNumber) -AutorestVersion $(Package.AutorestCSharpVersion) -StagingDirectory $(Build.ArtifactStagingDirectory)/packages

eng/scripts/Build-Packages.ps1

@@ -58,7 +58,7 @@ finally
 }
 
 # pack the c# npm package
-Push-Location "$artifactsPath/bin/AutoRest.CSharp/Release/net6.0/"
+Push-Location "$artifactsPath/bin/AutoRest.CSharp/Release/net7.0/"
 try {
     Write-Host "Working in $PWD"
     if ($BuildNumber) {

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.101",
+    "version": "7.0.404",
     "rollForward": "feature"
   }
 }

readme.md

@@ -3,7 +3,7 @@ ___
 
 :warning: We have updated the default generator used by `autorest --csharp` to the new version `V3`, which uses `@autorest/csharp` package and it will have few side effects:
    - It will generate code based on the [.NET SDK guidelines](https://azure.github.io/azure-sdk/dotnet_introduction.html), which will be totally different than the code generated by `V2` version.
-   - The dotnet core runtime 3.1+ is required.
+   - The dotnet 7.0 or above is required.
    - If you still want to generate code based on `V2` version, you can add `--legacy` flag to the command line to get the previous behavior.
 ___
 
@@ -57,7 +57,7 @@ ___
 ## Prerequisites
 
 - [NodeJS (18.x.x)](https://nodejs.org/en/) 
-- [.NET Core SDK (5.0.100)](https://dotnet.microsoft.com/download/dotnet-core/5.0)
+- [.NET Core SDK (7.0.404 or above)](https://dotnet.microsoft.com/download/dotnet/7.0)
 - [PowerShell Core 7](https://github.com/PowerShell/PowerShell/releases/latest)
 - `npm install` (at root)
 
@@ -1828,7 +1828,7 @@ namespace Azure.Service.Models
 # autorest-core version
 version: 3.9.7
 save-inputs: true
-use: $(this-folder)/artifacts/bin/AutoRest.CSharp/Debug/net6.0/
+use: $(this-folder)/artifacts/bin/AutoRest.CSharp/Debug/net7.0/
 clear-output-folder: true
 public-clients: true
 skip-csproj-packagereference: true

src/AutoRest.CSharp/AutoRest.CSharp.csproj

@@ -4,7 +4,7 @@
     <PackageId>Microsoft.Azure.AutoRest.CSharp</PackageId>
     <OutputType>Exe</OutputType>
     <Version>3.0.0</Version>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>

src/AutoRest.CSharp/Common/AutoRest/Plugins/NewProjectScaffolding.cs

@@ -382,7 +382,7 @@ private string GetUnbrandedTestCSProj()
         {
             var writer = new CSProjWriter()
             {
-                TargetFramework = "net6.0",
+                TargetFramework = "net7.0",
                 NoWarn = new("$(NoWarn);CS1591", "Ignore XML doc comments on test types and members")
             };
 

src/AutoRest.CSharp/Common/Input/Configuration.cs

@@ -129,7 +129,7 @@ public static void Initialize(
             if (publicClients && generation1ConvenienceClient && isAzureProject)
             {
                 var binaryLocation = typeof(Configuration).Assembly.Location;
-                if (!binaryLocation.EndsWith(Path.Combine("artifacts", "bin", "AutoRest.CSharp", "Debug", "net6.0", "AutoRest.CSharp.dll")))
+                if (!binaryLocation.EndsWith(Path.Combine("artifacts", "bin", "AutoRest.CSharp", "Debug", "net7.0", "AutoRest.CSharp.dll")))
                 {
                     if (_absoluteProjectFolder is not null)
                     {

src/AutoRest.CSharp/build/CodeGeneration.targets

@@ -20,7 +20,7 @@
       <TypespecAdditionalOptions></TypespecAdditionalOptions>
      
       Allows passing additional tsp command line arguments, for example to run special emitter 
-      use the following command line: dotnet msbuild /t:GenerateCode /p:TypespecAdditionalOptions="csharpGeneratorPath=/absolute/path/to/artifacts/bin/AutoRest.CSharp/Debug/net6.0/AutoRest.CSharp.dll"
+      use the following command line: dotnet msbuild /t:GenerateCode /p:TypespecAdditionalOptions="csharpGeneratorPath=/absolute/path/to/artifacts/bin/AutoRest.CSharp/Debug/net7.0/AutoRest.CSharp.dll"
     -->
 
     <IncludeAzureCoreSharedCode Condition="'$(IncludeAzureCoreSharedCode)' == ''">true</IncludeAzureCoreSharedCode>
@@ -30,7 +30,7 @@
 
     <_GenerateCode Condition="'$(AutoRestInput)' != '' OR '$(TypeSpecInput)' != ''">true</_GenerateCode>
     <UseDefaultNamespaceAndOutputFolder Condition="'$(UseDefaultNamespaceAndOutputFolder)' == ''">true</UseDefaultNamespaceAndOutputFolder>
-    <_AutoRestCommand>npx autorest@$(AutoRestVersion) --max-memory-size=8192 --skip-csproj --skip-upgrade-check --version=$(AutoRestCoreVersion) $(AutoRestInput) $(AutoRestAdditionalParameters) --use=$(MSBuildThisFileDirectory)../tools/net6.0/any/ --clear-output-folder=true --shared-source-folders=&quot;$(AzureCoreSharedCodeDirectory);$(AutoRestSharedCodeDirectory)&quot;</_AutoRestCommand>
+    <_AutoRestCommand>npx autorest@$(AutoRestVersion) --max-memory-size=8192 --skip-csproj --skip-upgrade-check --version=$(AutoRestCoreVersion) $(AutoRestInput) $(AutoRestAdditionalParameters) --use=$(MSBuildThisFileDirectory)../tools/net7.0/any/ --clear-output-folder=true --shared-source-folders=&quot;$(AzureCoreSharedCodeDirectory);$(AutoRestSharedCodeDirectory)&quot;</_AutoRestCommand>
     <_AutoRestCommand Condition="'$(UseDefaultNamespaceAndOutputFolder)' == 'true'">$(_AutoRestCommand) --output-folder=$(MSBuildProjectDirectory)/Generated --namespace=$(RootNamespace)</_AutoRestCommand>
     <_SaveInputs Condition="'$(SaveInputs)' == 'true'">-SaveInputs</_SaveInputs>
     <_TypespecAdditionalOptions Condition="'$(TypespecAdditionalOptions)' != ''">-TypespecAdditionalOptions "$(TypespecAdditionalOptions)"</_TypespecAdditionalOptions>
@@ -75,7 +75,7 @@
 
     <Error Text="Following GitHub URLs do not contain commit hash: @(GithubUrlsWithoutHash) please use permalinks for code generation inputs (see https://help.github.com/en/github/managing-files-in-a-repository/getting-permanent-links-to-files) " Condition="'@(GithubUrlsWithoutHash)' != ''" />
 
-    <Exec Command="npx autorest@$(AutoRestVersion) --max-memory-size=8192 --skip-csproj --skip-upgrade-check --version=$(AutoRestCoreVersion) $(AutoRestInput) $(AutoRestAdditionalParameters) --use=$(MSBuildThisFileDirectory)../tools/net6.0/any/ --output-folder=$(MSBuildProjectDirectory)/Generated --clear-output-folder=false --shared-source-folders=&quot;$(AzureCoreSharedCodeDirectory);$(AutoRestSharedCodeDirectory)&quot; --testmodeler={} --mgmt-debug.skip-codegen=true"/>
+    <Exec Command="npx autorest@$(AutoRestVersion) --max-memory-size=8192 --skip-csproj --skip-upgrade-check --version=$(AutoRestCoreVersion) $(AutoRestInput) $(AutoRestAdditionalParameters) --use=$(MSBuildThisFileDirectory)../tools/net7.0/any/ --output-folder=$(MSBuildProjectDirectory)/Generated --clear-output-folder=false --shared-source-folders=&quot;$(AzureCoreSharedCodeDirectory);$(AutoRestSharedCodeDirectory)&quot; --testmodeler={} --mgmt-debug.skip-codegen=true"/>
   </Target>
 
   <PropertyGroup Condition="'$(_GenerateCode)' == 'true'">

src/AutoRest.CodeModel/AutoRest.CodeModel.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

test/AutoRest.CSharp.UnitTests/AutoRest.CSharp.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>annotations</Nullable>
     <NoWarn>SA1649;SA1633;CS0618;CS1591;</NoWarn>

test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>annotations</Nullable>
     <NoWarn>SA1649;SA1633;CS0618</NoWarn>

test/AutoRest.TestServerLowLevel.Tests/AutoRest.TestServerLowLevel.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>annotations</Nullable>
     <NoWarn>SA1649;SA1633;CS0618</NoWarn>

test/CadlRanchProjects.Tests/CadlRanchProjects.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>annotations</Nullable>
     <NoWarn>SA1649;SA1633;CS0618</NoWarn>