reverting to 5.0 sdk, 5.0 tfm until 6.0 stablizes (#1492)

dotnet · Feb 8, 2021 · f908e4f · f908e4f
1 parent 83abd60
commit f908e4f
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 34 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -116,4 +116,9 @@
     <XunitExtensibilityExecutionPackageVersion>2.4.1</XunitExtensibilityExecutionPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <SystemCollectionsImmutableVersion>6.0.0-preview.1.21102.12</SystemCollectionsImmutableVersion>
+    <SystemComponentModelAnnotationsVersion>6.0.0-preview.1.21102.12</SystemComponentModelAnnotationsVersion>
+  </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.100-preview.1.21079.2"
+    "dotnet": "5.0.102"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.5"

diff --git a/global_install.cmd b/global_install.cmd
@@ -1,4 +1,4 @@
-set VERSION=5.0.0
+set VERSION=6.0.0-dev
 set DEFAULT_NUPKG_PATH=%userprofile%/.nuget/packages
 set SRC_DIR=%cd%
 set NUPKG=artifacts/packages/Debug/Shipping/

diff --git a/src/VS.Web.CG.Contracts/VS.Web.CG.Contracts.csproj b/src/VS.Web.CG.Contracts/VS.Web.CG.Contracts.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Contracts</AssemblyName>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Contracts</RootNamespace>
     <Description>Contains interfaces for Project Model and messaging for scaffolding.</Description>

diff --git a/src/VS.Web.CG.Core/VS.Web.CG.Core.csproj b/src/VS.Web.CG.Core/VS.Web.CG.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Contains the core infrastructure used by ASP.NET Core Code Generators.</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Core</AssemblyName>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Core</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/VS.Web.CG.Design/VS.Web.CG.Design.csproj b/src/VS.Web.CG.Design/VS.Web.CG.Design.csproj
@@ -6,7 +6,7 @@
 
   <Import Project="Shared.props" />
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
     <PackageId>Microsoft.VisualStudio.Web.CodeGeneration.Design</PackageId>
     <X86BinDirectory>$(ArtifactsBinDir)VS.Web.CG.Design-x86\</X86BinDirectory>
@@ -32,21 +32,21 @@
                       $(OutputPath)$(AssemblyName).xml;"
              Condition=" '$(DotNetBuildFromSource)' != 'true' ">
       <Pack>true</Pack>
-      <PackagePath>lib\net6.0\</PackagePath>
+      <PackagePath>lib\net5.0\</PackagePath>
     </Content>
 
-    <Content Include="$(ARMBinDirectory)$(Configuration)\net6.0\win-arm\$(AssemblyName).exe;
-                      $(ARMBinDirectory)$(Configuration)\net6.0\win-arm\$(AssemblyName).xml;"
+    <Content Include="$(ARMBinDirectory)$(Configuration)\net5.0\win-arm\$(AssemblyName).exe;
+                      $(ARMBinDirectory)$(Configuration)\net5.0\win-arm\$(AssemblyName).xml;"
              Condition=" '$(DotNetBuildFromSource)' != 'true' ">
       <Pack>true</Pack>
-      <PackagePath>runtimes\win-arm\lib\net6.0\</PackagePath>
+      <PackagePath>runtimes\win-arm\lib\net5.0\</PackagePath>
     </Content>
 
-    <Content Include="$(ARM64BinDirectory)$(Configuration)\net6.0\win-arm64\$(AssemblyName).exe;
-                      $(ARM64BinDirectory)$(Configuration)\net6.0\win-arm64\$(AssemblyName).xml;" 
+    <Content Include="$(ARM64BinDirectory)$(Configuration)\net5.0\win-arm64\$(AssemblyName).exe;
+                      $(ARM64BinDirectory)$(Configuration)\net5.0\win-arm64\$(AssemblyName).xml;" 
              Condition=" '$(DotNetBuildFromSource)' != 'true' ">
       <Pack>true</Pack>
-      <PackagePath>runtimes\win-arm64\lib\net6.0\</PackagePath>
+      <PackagePath>runtimes\win-arm64\lib\net5.0\</PackagePath>
     </Content>
   </ItemGroup>
 </Project>
diff --git a/src/VS.Web.CG.EFCore/VS.Web.CG.EFCore.csproj b/src/VS.Web.CG.EFCore/VS.Web.CG.EFCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Contains Entity Framework Core Services used by ASP.NET Core Code Generators.</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore</AssemblyName>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/VS.Web.CG.Msbuild/VS.Web.CG.Msbuild.csproj b/src/VS.Web.CG.Msbuild/VS.Web.CG.Msbuild.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MSBuild task (EvaluateProjectInfoForCodeGeneration) used by Microsoft.VisualStudio.Web.CodeGeneration.Tools</Description>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Msbuild</AssemblyName>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Msbuild</RootNamespace>
     <IsPackable>false</IsPackable>

diff --git a/src/VS.Web.CG.Mvc/VS.Web.CG.Mvc.csproj b/src/VS.Web.CG.Mvc/VS.Web.CG.Mvc.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Code Generators for ASP.NET Core MVC. Contains code generators for MVC Controllers and Views.</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.Web.CodeGenerators.Mvc</AssemblyName>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGenerators.Mvc</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -11,9 +11,9 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- This embedded resource is also packaged in order to allow VS to inspect the file. -->
-    <EmbeddedResource Include="Identity\bootstrap4_identitygeneratorfilesconfig.json" Pack="true" PackagePath="lib\net6.0\" />
+    <EmbeddedResource Include="Identity\bootstrap4_identitygeneratorfilesconfig.json" Pack="true" PackagePath="lib\net5.0\" />
     <Content Remove="Identity\bootstrap4_identitygeneratorfilesconfig.json" />
-    <EmbeddedResource Include="Identity\bootstrap3_identitygeneratorfilesconfig.json" Pack="true" PackagePath="lib\net6.0\" />
+    <EmbeddedResource Include="Identity\bootstrap3_identitygeneratorfilesconfig.json" Pack="true" PackagePath="lib\net5.0\" />
     <Content Remove="Identity\bootstrap3_identitygeneratorfilesconfig.json" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/VS.Web.CG.Templating/VS.Web.CG.Templating.csproj b/src/VS.Web.CG.Templating/VS.Web.CG.Templating.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Contains Razor based templating host used by ASP.NET Core Code Generators.</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Templating</AssemblyName>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Templating</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/VS.Web.CG.Utils/VS.Web.CG.Utils.csproj b/src/VS.Web.CG.Utils/VS.Web.CG.Utils.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Contains utilities used by ASP.NET Core Code Generation packages.</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Utils</AssemblyName>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Utils</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/VS.Web.CG/VS.Web.CG.csproj b/src/VS.Web.CG/VS.Web.CG.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Contains the CodeGenCommand that finds the appropriate code generator and invokes it from project dependencies.</Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration</AssemblyName>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -17,6 +17,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)"/>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/dotnet-aspnet-codegenerator/dotnet-aspnet-codegenerator.csproj b/src/dotnet-aspnet-codegenerator/dotnet-aspnet-codegenerator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Code Generation tool for ASP.NET Core. Contains the dotnet-aspnet-codegenerator command used for generating controllers and views. </Description>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Tools</RootNamespace>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <NoWarn>$(NoWarn);NU5118</NoWarn>
@@ -40,7 +40,7 @@
   <ItemGroup>
     <None Include="..\VS.Web.CG.Msbuild\Target\build\Microsoft.VisualStudio.Web.CodeGeneration.Tools.targets" CopyToPublishDirectory="Always" Link="build\microsoft.visualstudio.web.codegeneration.tools.targets" />
     <None Include="..\VS.Web.CG.Msbuild\Target\buildMultiTargeting\Microsoft.VisualStudio.Web.CodeGeneration.Tools.targets" CopyToPublishDirectory="Always" Link="buildMultiTargeting\microsoft.visualstudio.web.codegeneration.tools.targets" />
-    <None Include="$(ArtifactsBinDir)\VS.Web.CG.Msbuild\$(Configuration)\net6.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" CopyToPublishDirectory="Always" Link="toolassets\net6.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" />  
+    <None Include="$(ArtifactsBinDir)\VS.Web.CG.Msbuild\$(Configuration)\net5.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" CopyToPublishDirectory="Always" Link="toolassets\net5.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" />  
   </ItemGroup> 
 
   <ItemGroup>

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -2,7 +2,7 @@
   <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
-    <DeveloperBuildTestTfms>net6.0</DeveloperBuildTestTfms>
+    <DeveloperBuildTestTfms>net5.0</DeveloperBuildTestTfms>
     <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
   </PropertyGroup>
 

diff --git a/test/E2E_Test/E2E_Test.Tests.csproj b/test/E2E_Test/E2E_Test.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(RepoRoot)test\TestPackage.props" />
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
 

diff --git a/test/TestApps/ClassLibrary1/ClassLibrary1.csproj b/test/TestApps/ClassLibrary1/ClassLibrary1.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(RepoRoot)test\TestPackage.props" />
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/test/TestApps/ClassLibrary2/ClassLibrary2.csproj b/test/TestApps/ClassLibrary2/ClassLibrary2.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <Import Project="$(RepoRoot)test\TestPackage.props" />
   <ItemGroup>

diff --git a/test/TestApps/ModelTypesLocatorTestClassLibrary/ModelTypesLocatorTestClassLibrary.csproj b/test/TestApps/ModelTypesLocatorTestClassLibrary/ModelTypesLocatorTestClassLibrary.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
   <Import Project="$(RepoRoot)test\TestPackage.props" />
   <ItemGroup>

diff --git a/test/TestApps/ModelTypesLocatorTestWebApp/ModelTypesLocatorTestWebApp.csproj b/test/TestApps/ModelTypesLocatorTestWebApp/ModelTypesLocatorTestWebApp.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
   </PropertyGroup>
 
     <Import Project="$(RepoRoot)test\TestPackage.props" />

diff --git a/test/TestApps/PreviousPackage/PreviousPackage.csproj b/test/TestApps/PreviousPackage/PreviousPackage.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Library</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/test/TestApps/StablePackage/StablePackage.csproj b/test/TestApps/StablePackage/StablePackage.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Library</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/test/VS.Web.CG.Tools.Test/VS.Web.CG.Tools.Tests.csproj b/test/VS.Web.CG.Tools.Test/VS.Web.CG.Tools.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="$(RepoRoot)test\TestPackage.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Tools.Test</AssemblyName>
     <RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Tools</RootNamespace>
     <NoWarn>$(NoWarn);CS1591</NoWarn>

diff --git a/tools/VS.Web.CG.Design-anycpu/VS.Web.CG.Design-anycpu.csproj b/tools/VS.Web.CG.Design-anycpu/VS.Web.CG.Design-anycpu.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Shared.props" />
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <PlatformTarget>AnyCpu</PlatformTarget>
   </PropertyGroup>
 </Project>
diff --git a/tools/VS.Web.CG.Design-arm/VS.Web.CG.Design-arm.csproj b/tools/VS.Web.CG.Design-arm/VS.Web.CG.Design-arm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Shared.props" />
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifier>win-arm</RuntimeIdentifier>
   </PropertyGroup>
 </Project>
diff --git a/tools/VS.Web.CG.Design-arm64/VS.Web.CG.Design-arm64.csproj b/tools/VS.Web.CG.Design-arm64/VS.Web.CG.Design-arm64.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Shared.props" />
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
   </PropertyGroup>
 </Project>