.NET 6 testing (Azure#24260)

Co-authored-by: Christopher Scott <[email protected]>

CONTRIBUTING.md

@@ -9,7 +9,7 @@
 - Install VS 2019 (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 5.0.301 SDK** for your specific platform. (or a higher version within the 5.0.*** band)  (https://dotnet.microsoft.com/download/dotnet-core/5.0)
+- 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 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/) (14.x.x) if you plan to use [C# code generation](https://github.com/Azure/autorest.csharp).

common/SmokeTests/SmokeTest/SmokeTest.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461;net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <StartupObject>SmokeTest.Program</StartupObject>
   </PropertyGroup>

doc/ApiDocGeneration/assets/docgen.csproj

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

eng/Directory.Build.Common.props

@@ -24,12 +24,16 @@
 
   <!-- Setup default project properties -->
   <PropertyGroup>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>9</LangVersion>
     <!--
       Disable NU5105 NuGet Pack warning that the version is SemVer 2.0.
       SemVer 2.0 is supported by NuGet since 3.0.0 (July 2015) in some capacity, and fully since 3.5.0 (October 2016).
     -->
     <NoWarn>$(NoWarn);NU5105</NoWarn>
+    <!-- 
+      https://github.com/dotnet/roslyn-analyzers/issues/5628
+    -->
+    <NoWarn>$(NoWarn);CA1812</NoWarn>
     <!--
       Disable some FxCop rules
      -->
@@ -117,18 +121,11 @@
     <RequiredTargetFrameworks Condition="'$(SupportsNetStandard20)' == 'true'">netstandard2.0</RequiredTargetFrameworks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsSamplesProject)' == 'true'">
-    <IsPackable>false</IsPackable>
-    <RequiredTargetFrameworks>netcoreapp3.1;net5.0</RequiredTargetFrameworks>
-    <!-- Also test net461 on Windows; it's listed first so that coverage reports are for netcoreapp3.1 (the "primary"). -->
-    <RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.1;net5.0</RequiredTargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(IsPerfProject)' == 'true' or '$(IsStressProject)' == 'true'">
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsSamplesProject)' == 'true' or '$(IsPerfProject)' == 'true' or '$(IsStressProject)' == 'true'">
     <IsPackable>false</IsPackable>
-    <RequiredTargetFrameworks>netcoreapp3.1;net5.0</RequiredTargetFrameworks>
+    <RequiredTargetFrameworks>netcoreapp3.1;net6.0</RequiredTargetFrameworks>
     <!-- Also test net461 on Windows; it's listed first so that coverage reports are for netcoreapp3.1 (the "primary"). -->
-    <RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.1;net5.0</RequiredTargetFrameworks>
+    <RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp3.1;net6.0</RequiredTargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(IsMgmtSubLibrary)' == 'true' and !$(MSBuildProjectName.Equals('Azure.ResourceManager.Tests'))">

eng/mgmt/AzSdk.test.reference.props

@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	
   <PropertyGroup>
-		<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
 	</PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.3, 2.0.0)" />

eng/mgmt/Directory.Build.Mgmt.props

@@ -3,6 +3,7 @@
     <PkgVersion>0.12.0-dev.20210827.1</PkgVersion>
     <PkgLocalDir>$(NuGetPackageRoot)\microsoft.internal.netsdkbuild.mgmt.tools\$(PkgVersion)\Sdk</PkgLocalDir>
     <SymbolPackageFormat>symbols.nupkg</SymbolPackageFormat>
+    <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <!-- during execution of tasks tests, this conditional import will satisfy the import resolution. And you will have to manually execute a target to restore the package

eng/pipelines/mgmt.yml

@@ -173,7 +173,7 @@ variables:
 - name: msBuildLogDir
   value: msbuildlogs
 - name: loggingArgs
-  value: /clp:ShowtimeStamp /flp:LogFile=$(msBuildLogDir)/msbuild.normal.log;Verbosity=normal /flp1:Summary;Verbosity=minimal;LogFile=$(msBuildLogDir)/msbuild.sum.log /flp2:warningsonly;logfile=$(msBuildLogDir)/msbuild.wrn.log /flp3:errorsonly;logfile=$(msBuildLogDir)/msbuild.err.log
+  value: /clp:ShowtimeStamp /flp:Summary;Verbosity=minimal;LogFile=$(msBuildLogDir)/msbuild.sum.log /flp1:warningsonly;logfile=$(msBuildLogDir)/msbuild.wrn.log /flp2:errorsonly;logfile=$(msBuildLogDir)/msbuild.err.log
 - name: RPScopeArgs
   value: /p:PullRequestNumber=$(system.pullrequest.pullrequestnumber) /p:RepoHtmlUrl=https://github.com/$(build.repository.id) /p:CIBuildId=$(OfficialBuildId)
 - name: timeoutInMinutes

eng/pipelines/templates/jobs/ci.mgmt.yml

@@ -2,9 +2,11 @@ jobs:
   - job: Build
     timeoutInMinutes: 100
     pool:
-      vmImage: windows-2019
+      name: azsdk-pool-mms-win-2019-general
+      vmImage: MMS2019
     steps:
       #- script: "echo $(system.pullrequest.pullrequestnumber), https://github.com/$(build.repository.id), https://github.com/$(build.repository.ID)"
+      - template: /eng/pipelines/templates/steps/install-dotnet.yml
       - script: |
           if "$(BuildConfiguration)" == "Release" (set SkipTests=true) else (set SkipTests=false)
           dotnet msbuild mgmt.proj /v:m /t:CreateNugetPackage /p:Configuration=$(BuildConfiguration) /p:SkipTests=%SkipTests% /p:PackageOutputPath=$(Build.ArtifactStagingDirectory) /p:Scope=${{parameters.Scope}} /p:ForPublishing=$(ShouldPublish) $(loggingArgs) $(RPScopeArgs)"
@@ -43,11 +45,11 @@ jobs:
       maxParallel: $[ variables['MaxParallelTestJobs'] ]
       matrix:
         Linux:
-          Pool: Azure Pipelines
-          OSVmImage: "ubuntu-20.04"
+          Pool: azsdk-pool-mms-ubuntu-2004-general
+          OSVmImage: "MMSUbuntu20.04"
         Windows:
-          Pool: Azure Pipelines
-          OSVmImage: "windows-2019"
+          Pool: azsdk-pool-mms-win-2019-general
+          OSVmImage: MMS2019
         MacOs:
           Pool: Azure Pipelines
           OSVmImage: "macOS-10.15"
@@ -59,6 +61,7 @@ jobs:
         parameters:
           AgentImage: $(OSVmImage)
       - script: "echo $(system.pullrequest.pullrequestnumber), http://github.com/$(build.repository.id), http://github.com/$(build.repository.ID)"
+      - template: /eng/pipelines/templates/steps/install-dotnet.yml
       - script: "dotnet msbuild mgmt.proj /v:n /t:RunTests /p:Scope=${{parameters.Scope}} /p:ForPublishing=$(ShouldPublish) /clp:ShowtimeStamp $(RPScopeArgs)"
         displayName: "Build & Run Tests"
       - task: PublishTestResults@2
@@ -77,7 +80,8 @@ jobs:
     dependsOn:
       - Build
     pool:
-      vmImage: windows-2019
+      name: azsdk-pool-mms-win-2019-general
+      vmImage: MMS2019
     steps:
       - task: UsePythonVersion@0
         displayName: "Use Python 3.6"

eng/pipelines/templates/jobs/ci.yml

@@ -159,7 +159,7 @@ jobs:
         inputs:
           command: custom
           custom: 'tool'
-          arguments: 'install --global --add-source "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" --version "1.0.0-dev.20210730.3" "Azure.Sdk.Tools.SnippetGenerator"'
+          arguments: 'install --global --add-source "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" --version "1.0.0-dev.20211119.1" "Azure.Sdk.Tools.SnippetGenerator"'
           workingDirectory: '$(Agent.BuildDirectory)'
       - task: PowerShell@2
         displayName: "Verify generated code"

eng/pipelines/templates/jobs/smoke.tests.yml

@@ -78,7 +78,7 @@ jobs:
         Windows_Net50 (AzureCloud):
           Pool: "azsdk-pool-mms-win-2019-general"
           OSVmImage: "MMS2019"
-          TestTargetFramework: net5.0
+          TestTargetFramework: net6.0
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
           Location: "westus"

eng/pipelines/templates/stages/platform-matrix.json

@@ -21,7 +21,7 @@
     "TestTargetFramework": [
         "netcoreapp3.1",
         "net461",
-        "net5.0"
+        "net6.0"
     ],
     "AdditionalTestArguments": [
         "/p:UseProjectReferenceToAzureClients=false",

eng/pipelines/templates/steps/install-dotnet.yml

@@ -7,20 +7,30 @@ steps:
     inputs:
       solution: eng/InstallDevopsLogger.proj
       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'
-#     inputs:
-#       useGlobalJson: true
-#       performMultiLevelLookup: true
-#   - task: UseDotNet@2
-#     condition: ne(variables['Agent.OS'], 'Windows_NT') # Windows supports MultiLevelLookup and doesn't need explicit framework installation
-#     displayName: 'Use .NET Core 3.1 runtime'
-#     inputs:
-#       packageType: runtime
-#       version: "3.1.x"
+#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'
+    inputs:
+      useGlobalJson: true
+      performMultiLevelLookup: true
+# test-proxy requires net5.0
+  - task: UseDotNet@2
+    condition: ne(variables['Agent.OS'], 'Windows_NT') # Windows supports MultiLevelLookup and doesn't need explicit framework installation
+    displayName: 'Use .NET Core 5.0 runtime'
+    inputs:
+      packageType: runtime
+      performMultiLevelLookup: true
+      version: "5.0.x"
+  - task: UseDotNet@2
+    condition: ne(variables['Agent.OS'], 'Windows_NT') # Windows supports MultiLevelLookup and doesn't need explicit framework installation
+    displayName: 'Use .NET Core 3.1 SDK'
+    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"
   - task: Cache@2
     inputs:
       key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/eng/Packages.Data.props | ${{parameters.NuGetCacheKey}}'
       path: $(NUGET_PACKAGES)
-    displayName: Cache NuGet packages
+    displayName: Cache NuGet packages

eng/scripts/Update-Snippets.ps1

@@ -25,7 +25,7 @@ if (-not (Test-Path Env:TF_BUILD))
 
     dotnet tool install --global `
     --add-source "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" `
-    --version "1.0.0-dev.20210730.3" `
+    --version "1.0.0-dev.20211119.1" `
     "Azure.Sdk.Tools.SnippetGenerator"
 }
 else

global.json

@@ -3,7 +3,7 @@
     "Microsoft.Build.Traversal": "3.0.23"
   },
   "sdk": {
-    "version": "5.0.301",
+    "version": "6.0.100",
     "rollForward": "feature"
   }
 }

sdk/advisor/Microsoft.Azure.Management.Advisor/tests/Microsoft.Azure.Management.Advisor.Tests.csproj

@@ -5,7 +5,7 @@
     <Version>1.0.0</Version>
     <Description>Advisor.Tests Class library</Description>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

sdk/attestation/Azure.Security.Attestation/CHANGELOG.md

@@ -24,7 +24,7 @@ var policySetToken = new AttestationToken(
     BinaryData.FromObjectAsJson(new StoredAttestationPolicy { AttestationPolicy = attestationPolicy }),
     signingKey);
 
-using var shaHasher = SHA256Managed.Create();
+using var shaHasher = SHA256.Create();
 byte[] attestationPolicyHash = shaHasher.ComputeHash(Encoding.UTF8.GetBytes(policySetToken.Serialize()));
 
 Debug.Assert(attestationPolicyHash.SequenceEqual(setResult.Value.PolicyTokenHash.ToArray()));

sdk/attestation/Azure.Security.Attestation/README.md

@@ -229,7 +229,7 @@ var policySetToken = new AttestationToken(
     BinaryData.FromObjectAsJson(new StoredAttestationPolicy { AttestationPolicy = attestationPolicy }),
     signingKey);
 
-using var shaHasher = SHA256Managed.Create();
+using var shaHasher = SHA256.Create();
 byte[] attestationPolicyHash = shaHasher.ComputeHash(Encoding.UTF8.GetBytes(policySetToken.Serialize()));
 
 Debug.Assert(attestationPolicyHash.SequenceEqual(setResult.Value.PolicyTokenHash.ToArray()));

sdk/attestation/Azure.Security.Attestation/src/AttestationAdministrationClient.cs

@@ -208,7 +208,7 @@ private async Task<AttestationResponse<string>> GetPolicyInternalAsync(Attestati
         ///     BinaryData.FromObjectAsJson(new StoredAttestationPolicy { AttestationPolicy = attestationPolicy }),
         ///     signingKey);
         ///
-        /// using var shaHasher = SHA256Managed.Create();
+        /// using var shaHasher = SHA256.Create();
         /// byte[] attestationPolicyHash = shaHasher.ComputeHash(Encoding.UTF8.GetBytes(policySetToken.Serialize()));
         ///
         /// Debug.Assert(attestationPolicyHash.SequenceEqual(setResult.Value.PolicyTokenHash.ToArray()));
@@ -292,7 +292,7 @@ public virtual AttestationResponse<PolicyModificationResult> SetPolicy(
         ///     BinaryData.FromObjectAsJson(new StoredAttestationPolicy { AttestationPolicy = attestationPolicy }),
         ///     signingKey);
         ///
-        /// using var shaHasher = SHA256Managed.Create();
+        /// using var shaHasher = SHA256.Create();
         /// byte[] attestationPolicyHash = shaHasher.ComputeHash(Encoding.UTF8.GetBytes(policySetToken.Serialize()));
         ///
         /// Debug.Assert(attestationPolicyHash.SequenceEqual(setResult.Value.PolicyTokenHash.ToArray()));

sdk/attestation/Azure.Security.Attestation/tests/PolicyGetSetTests.cs

@@ -111,7 +111,7 @@ public async Task SetPolicyUnsecuredAad()
                 var policySetResult = await adminclient.SetPolicyAsync(AttestationType.OpenEnclave, disallowDebugging);
 
                 // The SetPolicyAsync API will create an UnsecuredAttestationToken to transmit the policy.
-                var shaHasher = SHA256Managed.Create();
+                var shaHasher = SHA256.Create();
                 var policySetToken = new AttestationToken(BinaryData.FromObjectAsJson(new StoredAttestationPolicy { AttestationPolicy = disallowDebugging }));
 
                 disallowDebuggingHash = shaHasher.ComputeHash(Encoding.UTF8.GetBytes(policySetToken.Serialize()));
@@ -177,7 +177,7 @@ public async Task SetPolicySecured(AttestationAdministrationClient adminClient,
             {
                 var policySetResult = await adminClient.SetPolicyAsync(AttestationType.OpenEnclave, disallowDebugging, new AttestationTokenSigningKey(rsaKey, x509Certificate));
 
-                var shaHasher = SHA256Managed.Create();
+                var shaHasher = SHA256.Create();
 
                 var policySetToken = new AttestationToken(
                     BinaryData.FromObjectAsJson(new StoredAttestationPolicy { AttestationPolicy = disallowDebugging }), new AttestationTokenSigningKey(rsaKey, x509Certificate));

sdk/attestation/Azure.Security.Attestation/tests/Samples/AttestationServiceAttestationSamples.cs

@@ -245,7 +245,7 @@ public async Task SettingAttestationPolicy()
                 BinaryData.FromObjectAsJson(new StoredAttestationPolicy { AttestationPolicy = attestationPolicy }),
                 signingKey);
 
-            using var shaHasher = SHA256Managed.Create();
+            using var shaHasher = SHA256.Create();
             byte[] attestationPolicyHash = shaHasher.ComputeHash(Encoding.UTF8.GetBytes(policySetToken.Serialize()));
 
             Debug.Assert(attestationPolicyHash.SequenceEqual(setResult.Value.PolicyTokenHash.ToArray()));

sdk/azurestack/Microsoft.AzureStack.Management.AzureBridge.Admin/tests/Microsoft.AzureStack.Management.AzureBridge.Tests.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <!-- <PropertyGroup> -->
-        <!-- <TargetFrameworks>netcoreapp1.1</TargetFrameworks> -->
+        <!-- <TargetFrameworks>netcoreapp3.1</TargetFrameworks> -->
     <!-- </PropertyGroup> -->
 
     <ItemGroup>

sdk/azurestack/Microsoft.AzureStack.Management.Commerce.Admin/tests/Microsoft.AzureStack.Management.Commerce.Tests.csproj

@@ -6,9 +6,7 @@
     <AssemblyName>Commerce.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <!--<PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>-->
+
 
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.AzureStack.Management.Commerce.Admin.csproj" />

sdk/azurestack/Microsoft.AzureStack.Management.Compute.Admin/tests/Microsoft.AzureStack.Management.Compute.Tests.csproj

@@ -6,9 +6,7 @@
     <AssemblyName>Compute.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <!--<PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>-->
+
 
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.AzureStack.Management.Compute.Admin.csproj" />

sdk/azurestack/Microsoft.AzureStack.Management.Gallery.Admin/tests/Microsoft.AzureStack.Management.Gallery.Tests.csproj

@@ -6,9 +6,7 @@
     <AssemblyName>Gallery.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>
   </PropertyGroup>
-  <!--<PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>-->
+
 
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.AzureStack.Management.Gallery.Admin.csproj" />

sdk/azurestack/Microsoft.AzureStack.Management.InfrastructureInsights.Admin/tests/Microsoft.AzureStack.Management.InfrastructureInsights.Tests.csproj

@@ -6,9 +6,7 @@
     <AssemblyName>InfrastructureInsights.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <!--<PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>-->
+
 
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.AzureStack.Management.InfrastructureInsights.Admin.csproj" />

sdk/azurestack/Microsoft.AzureStack.Management.KeyVault.Admin/tests/KeyVault.Tests.csproj

@@ -6,9 +6,6 @@
     <AssemblyName>KeyVault.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <!--<PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>-->
 
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.AzureStack.Management.KeyVault.Admin.csproj" />

sdk/azurestack/Microsoft.AzureStack.Management.Network.Admin/tests/Microsoft.AzureStack.Management.Network.Tests.csproj

@@ -6,9 +6,7 @@
     <AssemblyName>Network.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <!--<PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>-->
+
 
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.AzureStack.Management.Network.Admin.csproj" />

sdk/azurestack/Microsoft.AzureStack.Management.Storage.Admin/tests/Microsoft.AzureStack.Management.Storage.Admin.Tests.csproj

@@ -6,9 +6,7 @@
     <AssemblyName>Storage.Admin.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <!--<PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>-->
+
 
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.AzureStack.Management.Storage.Admin.csproj" />

sdk/azurestack/Microsoft.AzureStack.Management.Subscription/tests/Microsoft.AzureStack.Management.Subscription.Tests.csproj

@@ -6,9 +6,7 @@
     <AssemblyName>Subscription.Tests</AssemblyName>
     <VersionPrefix>1.0.0</VersionPrefix>    
   </PropertyGroup>
-  <!--<PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-  </PropertyGroup>-->
+
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.AzureStack.Management.Subscription.csproj" />
   </ItemGroup>