diff --git a/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd index da99dfc84d1e..23c44b0c54f6 100644 --- a/build/RunTestsOnHelix.cmd +++ b/build/RunTestsOnHelix.cmd @@ -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% diff --git a/build/RunTestsOnHelix.sh b/build/RunTestsOnHelix.sh index e2498334e5ee..3b774d1b7fe4 100644 --- a/build/RunTestsOnHelix.sh +++ b/build/RunTestsOnHelix.sh @@ -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 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 569b945047de..9292dccf2288 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,41 +26,41 @@ https://github.com/dotnet/templating 9b8b780bf233907ae5d38aaf8c8b769782322735 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 https://github.com/dotnet/msbuild @@ -134,21 +134,21 @@ https://github.com/dotnet/linker 4e77a943d360a5afea00de7b8a2d0ba2c721223f - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 https://github.com/dotnet/windowsdesktop @@ -289,9 +289,9 @@ https://github.com/dotnet/arcade 427c05909067bb2e484116ae2239456bb45adb85 - + https://github.com/dotnet/runtime - a61c1a3cf5a3391c8df61d5db739ba7d1674bba5 + 8929153f16c841cfd6269f511d4c0b65ba5d1965 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 36e10003c4c8..c733efc602c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,12 +30,12 @@ 5.0.0 7.0.0-beta.21576.4 3.1.0 - 7.0.0-alpha.1.21602.1 + 7.0.0-alpha.1.21606.1 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-alpha.1.21602.1 + 7.0.0-alpha.1.21606.1 1.0.0-preview1.1.21112.1 4.6.0 2.0.0-beta1.21601.2 @@ -43,13 +43,13 @@ - 7.0.0-alpha.1.21602.1 - 7.0.0-alpha.1.21602.1 - 7.0.0-alpha.1.21602.1 + 7.0.0-alpha.1.21606.1 + 7.0.0-alpha.1.21606.1 + 7.0.0-alpha.1.21606.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 7.0.0-alpha.1.21602.1 - 7.0.0-alpha.1.21602.1 - 7.0.0-alpha.1.21602.1 + 7.0.0-alpha.1.21606.1 + 7.0.0-alpha.1.21606.1 + 7.0.0-alpha.1.21606.1 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -83,10 +83,10 @@ - 7.0.0-alpha.1.21602.1 - 7.0.0-alpha.1.21602.1 + 7.0.0-alpha.1.21606.1 + 7.0.0-alpha.1.21606.1 5.0.0-preview.7.20364.11 - 7.0.0-alpha.1.21602.1 + 7.0.0-alpha.1.21606.1 diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs index dcca33136495..76ebb1cf377f 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs @@ -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 @@ -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 diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs index a890cbd68b2e..76c1d80551ea 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs @@ -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 diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs index 984ef19ab96a..d050a1170ba5 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs @@ -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 @@ -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