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.

Sign up for GitHub

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

[main] Update dependencies from dotnet/runtime #22892

Merged
merged 6 commits into from
Dec 7, 2021
Merged

[main] Update dependencies from dotnet/runtime #22892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
343b388
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Dec 3, 2021
4be38b2
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Dec 4, 2021
285b334
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Dec 5, 2021
ce85173
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Dec 6, 2021
bab7dde
Skip failing Blazor tests
TanayParikh Dec 6, 2021
666502c
Add Nuget robustness
danmoseley Dec 7, 2021
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
6 changes: 6 additions & 0 deletions build/RunTestsOnHelix.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@

REM make NuGet network operations more robust
set NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
set NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
set NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000

set MicrosoftNETBuildExtensionsTargets=%HELIX_CORRELATION_PAYLOAD%\ex\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\Microsoft.NET.Build.Extensions.targets
set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\d
set PATH=%DOTNET_ROOT%;%PATH%
Expand Down
5 changes: 5 additions & 0 deletions build/RunTestsOnHelix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#!/usr/bin/env bash

# make NuGet network operations more robust
export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000

export MicrosoftNETBuildExtensionsTargets=$HELIX_CORRELATION_PAYLOAD/ex/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets
export DOTNET_ROOT=$HELIX_CORRELATION_PAYLOAD/d
export PATH=$DOTNET_ROOT:$PATH
Expand Down
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,41 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>9b8b780bf233907ae5d38aaf8c8b769782322735</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.1.0-preview-21579-12">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -134,21 +134,21 @@
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>4e77a943d360a5afea00de7b8a2d0ba2c721223f</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="System.CodeDom" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="System.Resources.Extensions" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-alpha.1.21602.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -289,9 +289,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-alpha.1.21602.1">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-alpha.1.21606.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>a61c1a3cf5a3391c8df61d5db739ba7d1674bba5</Sha>
<Sha>8929153f16c841cfd6269f511d4c0b65ba5d1965</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21518.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,26 @@
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.21576.4</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-alpha.1.21602.1</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-alpha.1.21606.1</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-alpha.1.21602.1</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-alpha.1.21606.1</SystemReflectionMetadataLoadContextVersion>
<DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta1.21601.2</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview2.6.21561.1</MicrosoftDeploymentDotNetReleasesVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21602.1</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21602.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21602.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21606.1</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21606.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21606.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-alpha.1.21602.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-alpha.1.21602.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-alpha.1.21602.1</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-alpha.1.21606.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-alpha.1.21606.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-alpha.1.21606.1</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
</PropertyGroup>
Expand Down Expand Up @@ -83,10 +83,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>7.0.0-alpha.1.21602.1</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-alpha.1.21602.1</SystemTextEncodingCodePagesPackageVersion>
<SystemCodeDomPackageVersion>7.0.0-alpha.1.21606.1</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-alpha.1.21606.1</SystemTextEncodingCodePagesPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-alpha.1.21602.1</SystemResourcesExtensionsPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-alpha.1.21606.1</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
4 changes: 2 additions & 2 deletions ...sts/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public BlazorWasmStaticWebAssetsIntegrationTest(ITestOutputHelper log) : base(lo
DotNet5JSTemplate = $"dotnet.{RuntimeVersion}.js";
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
public void StaticWebAssets_BuildMinimal_Works()
{
// Arrange
Expand Down Expand Up @@ -90,7 +90,7 @@ public void StaticWebAssets_PublishMinimal_Works()
intermediateOutputPath);
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
public void StaticWebAssets_Build_Hosted_Works()
{
// Arrange
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ public void Build_Hosted_Works()
new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "_bin", "blazorwasm.dll")).Should().NotExist();
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
public void Build_SatelliteAssembliesAreCopiedToBuildOutput()
{
// Arrange
Expand Down
4 changes: 2 additions & 2 deletions src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public WasmJsModulesIntegrationTests(ITestOutputHelper log) : base(log, Generate
{
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
public void Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest()
{
// Arrange
Expand Down Expand Up @@ -53,7 +53,7 @@ public void Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonM
new FileInfo(Path.Combine(outputPath, "wwwroot", "blazorwasm-minimal.modules.json")).Should().NotExist();
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
public void JSModules_ManifestIncludesModuleTargetPaths()
{
// Arrange
Expand Down