Skip to content

Commit b69e8f5

Browse files
dotnet-maestro[bot]marcpopMSFTwtgodbemarek-safarjaviercn
authored
[main] Update dependencies from dotnet/runtime (#24195)
* Update dependencies from https://github.com/dotnet/runtime build 20220302.5 Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22152.5 * Update dependencies from https://github.com/dotnet/runtime build 20220304.1 Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , System.Reflection.MetadataLoadContext , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22154.1 * Update dependencies from https://github.com/dotnet/runtime build 20220304.8 Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , System.Reflection.MetadataLoadContext , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22154.8 * Update dependencies from https://github.com/dotnet/runtime build 20220305.4 Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , System.Reflection.MetadataLoadContext , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22155.4 * Update dependencies from https://github.com/dotnet/runtime build 20220307.1 Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , System.Reflection.MetadataLoadContext , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22157.1 * Update global.json * Update restore-toolset.sh * Update restore-toolset.ps1 * Update dependencies from https://github.com/dotnet/runtime build 20220308.1 Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , System.Reflection.MetadataLoadContext , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.1 * Update Versions.props * Update redist.csproj * Update global.json * Update dependencies from https://github.com/dotnet/runtime build 20220308.2 Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.NETCore.DotNetHostResolver , System.Reflection.MetadataLoadContext , System.Text.Encoding.CodePages , System.Security.Cryptography.ProtectedData , System.Resources.Extensions , System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 * Update ReferenceExeTests.cs * Update Versions.props * Update WorkloadTests.cs * Update baselines * Update SourceBuild.props Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Marc Paine <marcpop@microsoft.com> Co-authored-by: William Godbe <wigodbe@microsoft.com> Co-authored-by: Marek Safar <marek.safar@gmail.com> Co-authored-by: Javier Calvarro Nelson <jacalvar@microsoft.com>
1 parent ae0cce5 commit b69e8f5

25 files changed

+75
-74
lines changed

‎eng/SourceBuild.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<GitHubRepositoryName>sdk</GitHubRepositoryName>
55
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
66
</PropertyGroup>
7-
87
<Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
98
<PropertyGroup>
109
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\source-build.slnf"</InnerBuildArgs>
10+
<InnerBuildArgs>$(InnerBuildArgs) /p:UseSharedCompilation=false</InnerBuildArgs>
1111
</PropertyGroup>
1212
</Target>
1313

‎eng/Version.Details.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,41 +26,41 @@
2626
<Uri>https://github.com/dotnet/templating</Uri>
2727
<Sha>c30b2dca81bec3f510cc2fd7c77d9c5384bb2204</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.3.22151.6">
29+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.3.22158.2">
3030
<Uri>https://github.com/dotnet/runtime</Uri>
31-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
31+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
3232
</Dependency>
33-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.3.22151.6">
33+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.3.22158.2">
3434
<Uri>https://github.com/dotnet/runtime</Uri>
35-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
35+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
3636
</Dependency>
37-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.3.22151.6">
37+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.3.22158.2">
3838
<Uri>https://github.com/dotnet/runtime</Uri>
39-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
39+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.3.22151.6">
41+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.3.22158.2">
4242
<Uri>https://github.com/dotnet/runtime</Uri>
43-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
43+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.3.22151.6">
45+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.3.22158.2">
4646
<Uri>https://github.com/dotnet/runtime</Uri>
47-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
47+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.3.22151.6">
49+
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.3.22158.2">
5050
<Uri>https://github.com/dotnet/runtime</Uri>
51-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
51+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-preview.3.22151.6">
53+
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-preview.3.22158.2">
5454
<Uri>https://github.com/dotnet/runtime</Uri>
55-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
55+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.3.22151.6">
57+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.3.22158.2">
5858
<Uri>https://github.com/dotnet/runtime</Uri>
59-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
59+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.3.22151.6">
61+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.3.22158.2">
6262
<Uri>https://github.com/dotnet/runtime</Uri>
63-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
63+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
6464
</Dependency>
6565
<Dependency Name="Microsoft.Build" Version="17.2.0-preview-22154-03">
6666
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -134,21 +134,21 @@
134134
<Uri>https://github.com/dotnet/linker</Uri>
135135
<Sha>e003f2c4e13a1d89279afa4d655c6a15feac18b5</Sha>
136136
</Dependency>
137-
<Dependency Name="System.CodeDom" Version="7.0.0-preview.3.22151.6">
137+
<Dependency Name="System.CodeDom" Version="7.0.0-preview.3.22158.2">
138138
<Uri>https://github.com/dotnet/runtime</Uri>
139-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
139+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
140140
</Dependency>
141-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-preview.3.22151.6">
141+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-preview.3.22158.2">
142142
<Uri>https://github.com/dotnet/runtime</Uri>
143-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
143+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
144144
</Dependency>
145-
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-preview.3.22151.6">
145+
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-preview.3.22158.2">
146146
<Uri>https://github.com/dotnet/runtime</Uri>
147-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
147+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
148148
</Dependency>
149-
<Dependency Name="System.Resources.Extensions" Version="7.0.0-preview.3.22151.6">
149+
<Dependency Name="System.Resources.Extensions" Version="7.0.0-preview.3.22158.2">
150150
<Uri>https://github.com/dotnet/runtime</Uri>
151-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
151+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
152152
</Dependency>
153153
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-preview.3.22159.1">
154154
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -285,9 +285,9 @@
285285
<Uri>https://github.com/dotnet/arcade</Uri>
286286
<Sha>81001b45bd54f9223905bf55f6ed0125273580fa</Sha>
287287
</Dependency>
288-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-preview.3.22151.6">
288+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-preview.3.22158.2">
289289
<Uri>https://github.com/dotnet/runtime</Uri>
290-
<Sha>2330b4bef645bf8bcd3011f35968e55192c697f5</Sha>
290+
<Sha>8342a08b8bf0ff2ffb64cd5992e2d60c8d6d63c1</Sha>
291291
</Dependency>
292292
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22154.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
293293
<Uri>https://github.com/dotnet/xliff-tasks</Uri>

‎eng/Versions.props

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<!-- Opt out of certain Arcade features -->
88
<PropertyGroup>
99
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
10+
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
1011
</PropertyGroup>
1112
<!-- Repo Version Information -->
1213
<PropertyGroup>
@@ -29,26 +30,26 @@
2930
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
3031
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22157.6</MicrosoftDotNetSignToolVersion>
3132
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
32-
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-preview.3.22151.6</SystemSecurityCryptographyProtectedDataPackageVersion>
33+
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-preview.3.22158.2</SystemSecurityCryptographyProtectedDataPackageVersion>
3334
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3435
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
3536
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
3637
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
37-
<SystemReflectionMetadataLoadContextVersion>7.0.0-preview.3.22151.6</SystemReflectionMetadataLoadContextVersion>
38+
<SystemReflectionMetadataLoadContextVersion>7.0.0-preview.3.22158.2</SystemReflectionMetadataLoadContextVersion>
3839
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
3940
<SystemCommandLineVersion>2.0.0-beta3.22157.1</SystemCommandLineVersion>
4041
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview3.6.22115.1</MicrosoftDeploymentDotNetReleasesVersion>
4142
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
4243
</PropertyGroup>
4344
<PropertyGroup>
4445
<!-- Dependencies from https://github.com/dotnet/runtime -->
45-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.3.22151.6</MicrosoftNETCoreAppRefPackageVersion>
46-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.3.22151.6</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
47-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.3.22151.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
46+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.3.22158.2</MicrosoftNETCoreAppRefPackageVersion>
47+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.3.22158.2</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
48+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.3.22158.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
4849
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
49-
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-preview.3.22151.6</MicrosoftExtensionsDependencyModelPackageVersion>
50-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.3.22151.6</MicrosoftNETCoreDotNetHostResolverPackageVersion>
51-
<MicrosoftNETHostModelVersion>7.0.0-preview.3.22151.6</MicrosoftNETHostModelVersion>
50+
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-preview.3.22158.2</MicrosoftExtensionsDependencyModelPackageVersion>
51+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.3.22158.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
52+
<MicrosoftNETHostModelVersion>7.0.0-preview.3.22158.2</MicrosoftNETHostModelVersion>
5253
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
5354
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
5455
</PropertyGroup>
@@ -82,9 +83,9 @@
8283
</PropertyGroup>
8384
<PropertyGroup>
8485
<!-- Dependencies from https://github.com/dotnet/runtime -->
85-
<SystemCodeDomPackageVersion>7.0.0-preview.3.22151.6</SystemCodeDomPackageVersion>
86-
<SystemTextEncodingCodePagesPackageVersion>7.0.0-preview.3.22151.6</SystemTextEncodingCodePagesPackageVersion>
87-
<SystemResourcesExtensionsPackageVersion>7.0.0-preview.3.22151.6</SystemResourcesExtensionsPackageVersion>
86+
<SystemCodeDomPackageVersion>7.0.0-preview.3.22158.2</SystemCodeDomPackageVersion>
87+
<SystemTextEncodingCodePagesPackageVersion>7.0.0-preview.3.22158.2</SystemTextEncodingCodePagesPackageVersion>
88+
<SystemResourcesExtensionsPackageVersion>7.0.0-preview.3.22158.2</SystemResourcesExtensionsPackageVersion>
8889
</PropertyGroup>
8990
<PropertyGroup>
9091
<!-- Dependencies from https://github.com/dotnet/format -->
@@ -128,6 +129,7 @@
128129
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.2.0-2.22158.15</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
129130
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.2.0-2.22158.15</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
130131
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.2.0-2.22158.15</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
132+
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
131133
</PropertyGroup>
132134
<PropertyGroup>
133135
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

‎eng/restore-toolset.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function InitializeCustomSDKToolset {
2121
InstallDotNetSharedFramework "2.2.8"
2222
InstallDotNetSharedFramework "3.1.0"
2323
InstallDotNetSharedFramework "5.0.0"
24-
InstallDotNetSharedFramework "6.0.0-rc.2.21452.2"
24+
InstallDotNetSharedFramework "6.0.0"
2525

2626
CreateBuildEnvScripts
2727
InstallNuget

‎eng/restore-toolset.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function InitializeCustomSDKToolset {
2929
InstallDotNetSharedFramework "2.2.8"
3030
InstallDotNetSharedFramework "3.1.0"
3131
InstallDotNetSharedFramework "5.0.0"
32-
InstallDotNetSharedFramework "6.0.0-rc.2.21452.2"
32+
InstallDotNetSharedFramework "6.0.0"
3333

3434
CreateBuildEnvScript
3535
}

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.100-alpha.1.21478.48",
3+
"dotnet": "7.0.100-preview.3.22158.2",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"

‎src/Layout/redist/redist.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<PackageReference Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
3131
<PackageReference Condition=" '$(DotNetBuildFromSource)' != 'true' " Include="NuGet.Localization" Version="$(NuGetLocalizationPackageVersion)" />
3232
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelPackageVersion)" />
33-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" />
3433
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true" />
3534
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true" />
3635
<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" ExcludeAssets="All" GeneratePathProperty="true" />

‎src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public void ExeProjectCanReferenceTestProject(string testTemplateName)
304304
var testConsoleProject = new TestProject("ConsoleApp")
305305
{
306306
IsExe = true,
307-
TargetFrameworks = "net6.0",
307+
TargetFrameworks = "net7.0",
308308
RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid()
309309
};
310310

‎src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
269269
.BeEquivalentTo("android");
270270
}
271271

272-
[Theory]
272+
[Theory(Skip = "https://github.com/dotnet/installer/issues/13361")]
273273
[InlineData("net6.0-android;net6.0-ios", "net6.0-android;net6.0-ios", "android;android-aot")]
274274
[InlineData("net6.0", "net6.0;net6.0-android;net6.0-ios", "macos;android-aot")]
275275
[InlineData("net6.0;net6.0-ios", "net6.0;net6.0-android", "macos;android-aot")]

‎src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,4 +448,4 @@
448448
"${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\blazorwasm-minimal.dll",
449449
"${ProjectPath}\\obj\\Debug\\${Tfm}\\linked\\netstandard.dll",
450450
"${ProjectPath}\\obj\\Debug\\${Tfm}\\publish.extension.txt"
451-
]
451+
]

0 commit comments

Comments
 (0)