Sync tools code from main branch to generation branch

.azure-pipelines/powershell-core.yml

@@ -1,5 +1,5 @@
 variables:
-  WindowsName: windows 
+  WindowsName: windows
   WindowsAgentPoolName: pool-windows-2019
   WindowsAgentPoolVMImage: ''
   LinuxName: linux
@@ -8,7 +8,7 @@ variables:
   MacOSName: macOS
   MacOSAgentPoolName: 'Azure Pipelines'
   MacOSAgentPoolVMImage: macOS-11
-  TestFramework: netcoreapp3.1
+  TestFramework: net6.0
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true

.azure-pipelines/test-coverage.yml

@@ -1,7 +1,4 @@
 parameters:
-- name: dotnet_sdk_3_1
-  displayName: .NET Core 3.1
-  default: 3.1.x
 - name: dotnet_sdk_6
   displayName: .NET 6
   type: string
@@ -13,7 +10,7 @@ parameters:
 - name: testFramework
   displayName: Test Framework
   type: string
-  default: netcoreapp3.1
+  default: net6.0
 - name: testPoolName
   displayName: Test Pool Name
   type: string
@@ -64,10 +61,10 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Install .NET Core 3.1 SDK'
+    displayName: 'Install .NET 6.0 SDK'
     inputs:
       packageType: sdk
-      version: ${{ parameters.dotnet_sdk_3_1 }}
+      version: ${{ parameters.dotnet_sdk_6 }}
 
   - task: PowerShell@2
     displayName: Initialize Environment

.azure-pipelines/util/test-steps.yml

@@ -26,10 +26,10 @@ steps:
     pwsh: true
 
 - task: UseDotNet@2
-  displayName: 'Use .NET Core sdk'
+  displayName: 'Use .NET SDK 6 for tests'
   inputs:
     packageType: sdk
-    version: 3.1.x
+    version: 6.0.x
 
 - task: PowerShell@2
   displayName: Remove pre-installed Az modules

.azure-pipelines/windows-powershell.yml

@@ -2,7 +2,7 @@ variables:
   AgentPoolName: pool-windows-2019
   WindowsName: windows
   WindowsImage: windows-2019
-  TestFramework: netcoreapp3.1
+  TestFramework: net6.0
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true

build.proj

@@ -193,12 +193,11 @@
       <RuntimeDllsExcludeList>System.Security.Cryptography.ProtectedData.dll,System.Configuration.ConfigurationManager.dll,System.Runtime.CompilerServices.Unsafe.dll,System.IO.FileSystem.AccessControl.dll,System.Buffers.dll,System.Text.Encodings.Web.dll,System.CodeDom.dll,System.Management.dll,System.Text.Json.dll,System.Threading.Tasks.Extensions.dll,System.IO.Hashing.dll</RuntimeDllsExcludeList>
     </PropertyGroup>
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include $(RuntimeDllsIncludeList) -Exclude $(RuntimeDllsExcludeList) | Where-Object {$_.FullName -notlike '*Accounts*lib*' -and $_.FullName -notlike '*ModuleAlcAssemblies*'} | Remove-Item -Force&quot;"/>
-    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include 'runtimes' | Remove-Item -Recurse -Force&quot;" />
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include 'runtimes' | Remove-Item -Recurse -Force&quot;" Condition="'$(CodeSign)' == 'true'" />
 
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/UpdateModules.ps1 -BuildConfig $(Configuration) -Scope $(Scope)&quot;"/>
-
     <!-- Delete .deps.json files -->
-    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts) -Recurse -Include '*.deps.json' | Remove-Item -Recurse -Force -Confirm:$false -ErrorAction Ignore&quot;" IgnoreExitCode="true" />
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts) -Recurse | Where-Object { $_.Name -Like '*Az.*.deps.json' -or $_.Name -Like 'Microsoft.Azure.*.deps.json' } | Remove-Item -Recurse -Force&quot; "/>
   </Target>
 
   <Target Name="OnPremChecks" Condition="'$(OnPremiseBuild)'">
@@ -382,4 +381,4 @@ $(RepoArtifacts)/$(Configuration)/**/Microsoft.Azure.PowerShell.Authenticators.d
     <SetEnvVar EnvName="SignedMsiDir" EnvValue="$(SignedOutputRootDir)" />
   </Target>
 
-</Project>
+</Project>

src/Az.Test.props

@@ -18,11 +18,13 @@
 
   <!-- Build -->
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</AssemblyName>
     <RootNamespace>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <!-- Use this property to generate [Appname].runtimesettings.dev.json as in .NET 6 this file is no longer generated by default -->
+    <GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">