Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated all package versions and tfms to net6.0 #1599

Merged
merged 2 commits into from
Jul 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PropertyGroup>
<VersionPrefix>6.0.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>5</PreReleaseVersionIteration>
<PreReleaseVersionIteration>6</PreReleaseVersionIteration>
<IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
Expand All @@ -25,7 +25,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Microsoft.AspNetCore.Razor.Language -->
<MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-preview.5.21301.17</MicrosoftAspNetCoreRazorLanguagePackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreRazorLanguagePackageVersion>
<!-- Microsoft.AspNetCore.Razor.Runtime -->
<MicrosoftAspNetCoreRazorRuntimePackageVersion>2.2.0</MicrosoftAspNetCoreRazorRuntimePackageVersion>
<!-- Microsoft.Build-->
Expand All @@ -35,17 +35,17 @@
<!-- Microsoft.CodeAnalysis.CSharp -->
<MicrosoftCodeAnalysisCSharpPackageVersion>3.9.0</MicrosoftCodeAnalysisCSharpPackageVersion>
<!-- Microsoft.CodeAnalysis.Razor -->
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-preview.5.21301.17</MicrosoftCodeAnalysisRazorPackageVersion>
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-preview.6.21355.2</MicrosoftCodeAnalysisRazorPackageVersion>
<!-- Microsoft.CodeAnalysis.CSharp.Workspaces -->
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.9.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<!-- Microsoft.Extensions.CommandLineUtils.Sources -->
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>6.0.0-preview.1.21076.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<!-- Microsoft.EntityFrameworkCore.Design -->
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-preview.5.21301.9</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Microsoft.Extensions.DependencyInjection -->
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.5.21301.5</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsDependencyInjectionPackageVersion>
<!-- Microsoft.Extensions.FileProviders.Physical -->
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>6.0.0-preview.5.21301.5</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
<VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
<SystemCollectionsImmutablePackageVersion>5.0.0</SystemCollectionsImmutablePackageVersion>
Expand Down Expand Up @@ -83,15 +83,15 @@
<!-- Microsoft.DotNet.ProjectModel -->
<MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion>
<!-- Microsoft.EntityFrameworkCore -->
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0-preview.5.21301.9</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCorePackageVersion>
<!-- Microsoft.EntityFramework.Design for test-->
<MicrosoftEntityFrameworkCoreDesignTestPackageVersion>6.0.0-preview.5.21301.9</MicrosoftEntityFrameworkCoreDesignTestPackageVersion>
<MicrosoftEntityFrameworkCoreDesignTestPackageVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreDesignTestPackageVersion>
<!-- Microsoft.EntityFrameworkCore.SqlServer -->
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>6.0.0-preview.5.21301.9</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<!-- Microsoft.Extensions.Configuration.Abstractions -->
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-preview.5.21301.5</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<!-- Microsoft.Extensions.Configuration.EnvironmentVariables -->
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>6.0.0-preview.5.21301.5</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<!-- Microsoft.Extensions.Configuration.Json -->
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
<!-- Microsoft.Extensions.Configuration.UserSecrets -->
Expand Down Expand Up @@ -120,7 +120,7 @@
<XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
</PropertyGroup>
<PropertyGroup>
<SystemCollectionsImmutableVersion>6.0.0-preview.5.21301.5</SystemCollectionsImmutableVersion>
<SystemCollectionsImmutableVersion>6.0.0-preview.6.21352.12</SystemCollectionsImmutableVersion>
</PropertyGroup>
<!-- Package versions for MSIdentity projects-->
<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"tools": {
"dotnet": "5.0.301"
"dotnet": "6.0.100-preview.5.21302.13"
},
"sdk" : {
"version": "5.0.301"
"version": "6.0.100-preview.5.21302.13"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21222.1"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<Nullable>enable</Nullable>
<RootNamespace>Microsoft.DotNet.MSIdentity</RootNamespace>
<OutputType>Library</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.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>
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.Core/VS.Web.CG.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Contains the core infrastructure used by ASP.NET Core Code Generators.</Description>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Core</AssemblyName>
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Core</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Shared.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<PlatformTarget>AnyCpu</PlatformTarget>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Shared.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>win-arm</RuntimeIdentifier>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Shared.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
16 changes: 8 additions & 8 deletions src/Scaffolding/VS.Web.CG.Design/VS.Web.CG.Design.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<Import Project="Shared.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
<PackageId>Microsoft.VisualStudio.Web.CodeGeneration.Design</PackageId>
<X86BinDirectory>$(ArtifactsBinDir)VS.Web.CG.Design-x86\</X86BinDirectory>
Expand All @@ -26,21 +26,21 @@
$(OutputPath)$(AssemblyName).xml;"
Condition=" '$(DotNetBuildFromSource)' != 'true' ">
<Pack>true</Pack>
<PackagePath>lib\net5.0\</PackagePath>
<PackagePath>lib\net6.0\</PackagePath>
</Content>

<Content Include="$(ARMBinDirectory)$(Configuration)\net5.0\win-arm\$(AssemblyName).exe;
$(ARMBinDirectory)$(Configuration)\net5.0\win-arm\$(AssemblyName).xml;"
<Content Include="$(ARMBinDirectory)$(Configuration)\net6.0\win-arm\$(AssemblyName).exe;
$(ARMBinDirectory)$(Configuration)\net6.0\win-arm\$(AssemblyName).xml;"
Condition=" '$(DotNetBuildFromSource)' != 'true' ">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm\lib\net5.0\</PackagePath>
<PackagePath>runtimes\win-arm\lib\net6.0\</PackagePath>
</Content>

<Content Include="$(ARM64BinDirectory)$(Configuration)\net5.0\win-arm64\$(AssemblyName).exe;
$(ARM64BinDirectory)$(Configuration)\net5.0\win-arm64\$(AssemblyName).xml;"
<Content Include="$(ARM64BinDirectory)$(Configuration)\net6.0\win-arm64\$(AssemblyName).exe;
$(ARM64BinDirectory)$(Configuration)\net6.0\win-arm64\$(AssemblyName).xml;"
Condition=" '$(DotNetBuildFromSource)' != 'true' ">
<Pack>true</Pack>
<PackagePath>runtimes\win-arm64\lib\net5.0\</PackagePath>
<PackagePath>runtimes\win-arm64\lib\net6.0\</PackagePath>
</Content>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.EFCore/VS.Web.CG.EFCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Contains Entity Framework Core Services used by ASP.NET Core Code Generators.</Description>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore</AssemblyName>
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Outputs the Project Information needed for CodeGeneration to a file.
</PropertyGroup>

<PropertyGroup>
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)..\toolassets\net5.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)..\toolassets\net6.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
</PropertyGroup>

<UsingTask TaskName="ProjectContextWriter"
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.Msbuild/VS.Web.CG.Msbuild.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>MSBuild task (EvaluateProjectInfoForCodeGeneration) used by Microsoft.VisualStudio.Web.CodeGeneration.Tools</Description>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Msbuild</AssemblyName>
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Msbuild</RootNamespace>
<IsPackable>false</IsPackable>
Expand Down
6 changes: 3 additions & 3 deletions src/Scaffolding/VS.Web.CG.Mvc/VS.Web.CG.Mvc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Code Generators for ASP.NET Core MVC. Contains code generators for MVC Controllers and Views.</Description>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGenerators.Mvc</AssemblyName>
<RootNamespace>Microsoft.VisualStudio.Web.CodeGenerators.Mvc</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -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\net5.0\" />
<EmbeddedResource Include="Identity\bootstrap4_identitygeneratorfilesconfig.json" Pack="true" PackagePath="lib\net6.0\" />
<Content Remove="Identity\bootstrap4_identitygeneratorfilesconfig.json" />
<EmbeddedResource Include="Identity\bootstrap3_identitygeneratorfilesconfig.json" Pack="true" PackagePath="lib\net5.0\" />
<EmbeddedResource Include="Identity\bootstrap3_identitygeneratorfilesconfig.json" Pack="true" PackagePath="lib\net6.0\" />
<Content Remove="Identity\bootstrap3_identitygeneratorfilesconfig.json" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Contains Razor based templating host used by ASP.NET Core Code Generators.</Description>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Templating</AssemblyName>
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Templating</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG.Utils/VS.Web.CG.Utils.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Contains utilities used by ASP.NET Core Code Generation packages.</Description>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Utils</AssemblyName>
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Utils</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Scaffolding/VS.Web.CG/VS.Web.CG.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Contains the CodeGenCommand that finds the appropriate code generator and invokes it from project dependencies.</Description>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration</AssemblyName>
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion test/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\Directory.Build.props" />

<PropertyGroup>
<DeveloperBuildTestTfms>net5.0</DeveloperBuildTestTfms>
<DeveloperBuildTestTfms>net6.0</DeveloperBuildTestTfms>
<StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Scaffolding/E2E_Test/E2E_Test.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(RepoRoot)test\Scaffolding\TestPackage.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>
</PropertyGroup>

Expand Down
10 changes: 5 additions & 5 deletions test/Scaffolding/Shared/MSBuildProjectStrings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ internal class MsBuildProjectStrings
<RootNamespace>Microsoft.TestProject</RootNamespace>
<ProjectName>TestProject</ProjectName>
<OutputType>EXE</OutputType>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
</PropertyGroup>
Expand Down Expand Up @@ -634,7 +634,7 @@ protected override void OnModelCreating(ModelBuilder builder)
</When>
<Otherwise>
<PropertyGroup >
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)..\toolAssets\net5.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)..\toolAssets\net6.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
</PropertyGroup>
</Otherwise>
</Choose>
Expand Down Expand Up @@ -811,7 +811,7 @@ public static IWebHost BuildWebHost(string[] args) =>
<RestoreSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
</RestoreSources>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>Microsoft.Test</RootNamespace>
<ProjectName>Test</ProjectName>
<NoWarn>NU1605</NoWarn>
Expand Down Expand Up @@ -972,7 +972,7 @@ public class Blog
</When>
<Otherwise>
<PropertyGroup >
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)\toolAssets\net5.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)\toolAssets\net6.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
</PropertyGroup>
</Otherwise>
</Choose>
Expand Down Expand Up @@ -1021,7 +1021,7 @@ public class Blog
</EvaluateProjectInfoForCodeGenerationDependsOn>
</PropertyGroup>
<PropertyGroup>
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)\toolAssets\net5.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)\toolAssets\net6.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
</PropertyGroup>

<UsingTask TaskName=""ProjectContextWriter""
Expand Down
4 changes: 2 additions & 2 deletions test/Scaffolding/Shared/MsBuildProjectSetupHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ private static string GlobalJsonText
internal void SetupEmptyCodeGenerationProject(TemporaryFileProvider fileProvider, ITestOutputHelper outputHelper)
{
fileProvider.Add("global.json", GlobalJsonText);
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "net5.0"));
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "net6.0"));

fileProvider.Add($"TestCodeGeneration.targets", MsBuildProjectStrings.ProjectContextWriterMsbuildHelperText);

var msbuildTaskDllPath = Path.Combine(Path.GetDirectoryName(typeof(MsBuildProjectSetupHelper).Assembly.Location), "Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/net5.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/net6.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");

var rootProjectTxt = MsBuildProjectStrings.SimpleNet50ProjectText;
fileProvider.Add(MsBuildProjectStrings.RootProjectName, rootProjectTxt);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(RepoRoot)test\Scaffolding\TestPackage.props" />
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<Import Project="$(RepoRoot)test\Scaffolding\TestPackage.props" />
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<Import Project="$(RepoRoot)test\Scaffolding\TestPackage.props" />
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>

<Import Project="$(RepoRoot)test\Scaffolding\TestPackage.props" />
Expand Down
Loading