Skip to content

R
runtime

dotNET Platform / runtime
11 个月 前同步成功

通知 1
Star 1
Fork 0
R
runtime

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 8340546b 编写于 作者: V Viktor Hofer 提交者： GitHub
浏览文件
操作

Revert "[main] Update dependencies from mono/linker dotnet/runtime... 

Revert "[main] Update dependencies from mono/linker dotnet/runtime dotnet/arcade dnceng/internal/dotnet-optimization dotnet/xharness dotnet/hotreload-utils (#54060)" (#54177)

This reverts commit 4c0d2f01.
上级 398f7959
隐藏空白更改
内联 并排
Showing with 161 addition and 163 deletion
.config/dotnet-tools.json
浏览文件 @ 8340546b
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
] ]
}, },
"microsoft.dotnet.xharness.cli": { "microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.21314.1", "version": "1.0.0-prerelease.21307.1",
"commands": [ "commands": [
"xharness" "xharness"
] ]
......
eng/Version.Details.xml
浏览文件 @ 8340546b
...@@ -6,69 +6,69 @@ ...@@ -6,69 +6,69 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21311.3"> <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01"> <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri> <Uri>https://github.com/microsoft/vstest</Uri>
...@@ -146,73 +146,73 @@ ...@@ -146,73 +146,73 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha> <Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-preview.6.21314.1"> <Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-preview.6.21307.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha> <Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-preview.6.21314.1"> <Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-preview.6.21307.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha> <Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
</Dependency> </Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-preview.6.21314.1"> <Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-preview.6.21307.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha> <Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.6.21314.1"> <Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.6.21307.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha> <Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.6.21314.1"> <Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.6.21307.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha> <Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Text.Json" Version="6.0.0-preview.6.21314.1"> <Dependency Name="System.Text.Json" Version="6.0.0-preview.6.21307.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha> <Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.6.21314.1"> <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.6.21307.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha> <Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21310.3"> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21310.3">
<Uri>https://github.com/mono/linker</Uri> <Uri>https://github.com/mono/linker</Uri>
<Sha>caeaf2a3fb3f636805fdd4881df4f9a539fff8f6</Sha> <Sha>caeaf2a3fb3f636805fdd4881df4f9a539fff8f6</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21314.1"> <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21307.1">
<Uri>https://github.com/dotnet/xharness</Uri> <Uri>https://github.com/dotnet/xharness</Uri>
<Sha>d6f8a4ad30908fb210390380eae97264e4fbe8ce</Sha> <Sha>2751a33949055a45fd79e2ae126f127daf1aee44</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21314.1"> <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21307.1">
<Uri>https://github.com/dotnet/xharness</Uri> <Uri>https://github.com/dotnet/xharness</Uri>
<Sha>d6f8a4ad30908fb210390380eae97264e4fbe8ce</Sha> <Sha>2751a33949055a45fd79e2ae126f127daf1aee44</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21311.3"> <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21304.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha> <Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency> </Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21313.4"> <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21308.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f</Sha> <Sha>6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd</Sha>
</Dependency> </Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21313.4"> <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21308.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f</Sha> <Sha>6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd</Sha>
</Dependency> </Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21313.4"> <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21308.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f</Sha> <Sha>6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd</Sha>
</Dependency> </Dependency>
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21313.4"> <Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21308.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f</Sha> <Sha>6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.21.Node.win-x64" Version="6.0.0-preview.6.21275.1"> <Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.21.Node.win-x64" Version="6.0.0-preview.6.21275.1">
<Uri>https://github.com/dotnet/emsdk</Uri> <Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>defa37b05c734e025292c5747664e970cd2ac444</Sha> <Sha>defa37b05c734e025292c5747664e970cd2ac444</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21311.1"> <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21307.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri> <Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>25b814e010cd4796cedfbcce72a274c26928f496</Sha> <Sha>04541efa21e114256a1ca9ca4a14685fd9f7e48e</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>
eng/Versions.props
浏览文件 @ 8340546b
...@@ -49,28 +49,28 @@ ...@@ -49,28 +49,28 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion> <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpVersion> <MicrosoftCodeAnalysisCSharpVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpVersion>
<!-- Arcade dependencies --> <!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21311.3</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21304.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21311.3</MicrosoftDotNetBuildTasksFeedVersion> <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21304.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21311.3</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21304.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21311.3</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenAPIVersion>6.0.0-beta.21304.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21311.3</MicrosoftDotNetGenFacadesVersion> <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21304.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21311.3</MicrosoftDotNetXUnitExtensionsVersion> <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21304.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21311.3</MicrosoftDotNetXUnitConsoleRunnerVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21304.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21311.3</MicrosoftDotNetBuildTasksArchivesVersion> <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21304.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21311.3</MicrosoftDotNetBuildTasksPackagingVersion> <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21304.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21311.3</MicrosoftDotNetBuildTasksInstallersVersion> <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21304.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21311.3</MicrosoftDotNetRemoteExecutorVersion> <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21304.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21311.3</MicrosoftDotNetVersionToolsTasksVersion> <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21304.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21311.3</MicrosoftDotNetPackageTestingVersion> <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21304.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies --> <!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion> <NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies --> <!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppVersion> <MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-preview.6.21314.1</MicrosoftNETCoreDotNetHostVersion> <MicrosoftNETCoreDotNetHostVersion>6.0.0-preview.6.21307.1</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-preview.6.21314.1</MicrosoftNETCoreDotNetHostPolicyVersion> <MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-preview.6.21307.1</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion> <MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies --> <!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21314.1</MicrosoftNETCoreILAsmVersion> <MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21307.1</MicrosoftNETCoreILAsmVersion>
<!-- Libraries dependencies --> <!-- Libraries dependencies -->
<StyleCopAnalyzersVersion>1.2.0-beta.304</StyleCopAnalyzersVersion> <StyleCopAnalyzersVersion>1.2.0-beta.304</StyleCopAnalyzersVersion>
<SystemAppContextVersion>4.3.0</SystemAppContextVersion> <SystemAppContextVersion>4.3.0</SystemAppContextVersion>
...@@ -100,14 +100,14 @@ ...@@ -100,14 +100,14 @@
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion> <SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion> <SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion> <SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion>
<SystemTextJsonVersion>6.0.0-preview.6.21314.1</SystemTextJsonVersion> <SystemTextJsonVersion>6.0.0-preview.6.21307.1</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.6.21314.1</SystemRuntimeCompilerServicesUnsafeVersion> <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.6.21307.1</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingVersion>4.3.0</SystemThreadingVersion> <SystemThreadingVersion>4.3.0</SystemThreadingVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion> <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion> <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion> <MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion> <MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-preview.6.21314.1</runtimenativeSystemIOPortsVersion> <runtimenativeSystemIOPortsVersion>6.0.0-preview.6.21307.1</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies --> <!-- Runtime-Assets dependencies -->
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21307.1</SystemComponentModelTypeConverterTestDataVersion> <SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21307.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.21307.1</SystemDrawingCommonTestDataVersion> <SystemDrawingCommonTestDataVersion>6.0.0-beta.21307.1</SystemDrawingCommonTestDataVersion>
...@@ -119,10 +119,10 @@ ...@@ -119,10 +119,10 @@
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21307.1</SystemSecurityCryptographyX509CertificatesTestDataVersion> <SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21307.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21307.1</SystemWindowsExtensionsTestDataVersion> <SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21307.1</SystemWindowsExtensionsTestDataVersion>
<!-- dotnet-optimization dependencies --> <!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21313.4</optimizationwindows_ntx64MIBCRuntimeVersion> <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21308.4</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21313.4</optimizationwindows_ntx86MIBCRuntimeVersion> <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21308.4</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21313.4</optimizationlinuxx64MIBCRuntimeVersion> <optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21308.4</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21313.4</optimizationPGOCoreCLRVersion> <optimizationPGOCoreCLRVersion>1.0.0-prerelease.21308.4</optimizationPGOCoreCLRVersion>
<!-- Not auto-updated. --> <!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion> <MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion> <SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion>
...@@ -146,9 +146,9 @@ ...@@ -146,9 +146,9 @@
<!-- Testing --> <!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion> <MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion> <MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21314.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion> <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21307.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21314.1</MicrosoftDotNetXHarnessCLIVersion> <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21307.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21311.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion> <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21307.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.1</XUnitVersion> <XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion> <XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion> <CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
......
eng/common/dotnet-install.sh
浏览文件 @ 8340546b
...@@ -70,7 +70,7 @@ case $cpuname in ...@@ -70,7 +70,7 @@ case $cpuname in
;; ;;
esac esac
dotnetRoot="${repo_root}.dotnet" dotnetRoot="$repo_root/.dotnet"
if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
dotnetRoot="$dotnetRoot/$architecture" dotnetRoot="$dotnetRoot/$architecture"
fi fi
......
eng/common/internal-feed-operations.ps1
浏览文件 @ 8340546b
...@@ -45,11 +45,11 @@ function SetupCredProvider { ...@@ -45,11 +45,11 @@ function SetupCredProvider {
# Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable
# feeds successfully # feeds successfully
$nugetConfigPath = Join-Path $RepoRoot "NuGet.config" $nugetConfigPath = "$RepoRoot\NuGet.config"
if (-Not (Test-Path -Path $nugetConfigPath)) { if (-Not (Test-Path -Path $nugetConfigPath)) {
Write-PipelineTelemetryError -Category 'Build' -Message 'NuGet.config file not found in repo root!' Write-PipelineTelemetryError -Category 'Build' -Message 'NuGet.config file not found in repo root!'
ExitWithExitCode 1 ExitWithExitCode 1
} }
$endpoints = New-Object System.Collections.ArrayList $endpoints = New-Object System.Collections.ArrayList
...@@ -85,7 +85,7 @@ function SetupCredProvider { ...@@ -85,7 +85,7 @@ function SetupCredProvider {
#Workaround for https://github.com/microsoft/msbuild/issues/4430 #Workaround for https://github.com/microsoft/msbuild/issues/4430
function InstallDotNetSdkAndRestoreArcade { function InstallDotNetSdkAndRestoreArcade {
$dotnetTempDir = Join-Path $RepoRoot "dotnet" $dotnetTempDir = "$RepoRoot\dotnet"
$dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*) $dotnetSdkVersion="2.1.507" # After experimentation we know this version works when restoring the SDK (compared to 3.0.*)
$dotnet = "$dotnetTempDir\dotnet.exe" $dotnet = "$dotnetTempDir\dotnet.exe"
$restoreProjPath = "$PSScriptRoot\restore.proj" $restoreProjPath = "$PSScriptRoot\restore.proj"
......
eng/common/internal-feed-operations.sh
浏览文件 @ 8340546b
...@@ -39,7 +39,7 @@ function SetupCredProvider { ...@@ -39,7 +39,7 @@ function SetupCredProvider {
# Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable # Then, we set the 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' environment variable to restore from the stable
# feeds successfully # feeds successfully
local nugetConfigPath="{$repo_root}NuGet.config" local nugetConfigPath="$repo_root/NuGet.config"
if [ ! "$nugetConfigPath" ]; then if [ ! "$nugetConfigPath" ]; then
Write-PipelineTelemetryError -category 'Build' "NuGet.config file not found in repo's root!" Write-PipelineTelemetryError -category 'Build' "NuGet.config file not found in repo's root!"
......
eng/common/sdk-task.ps1
浏览文件 @ 8340546b
...@@ -34,7 +34,7 @@ function Print-Usage() { ...@@ -34,7 +34,7 @@ function Print-Usage() {
function Build([string]$target) { function Build([string]$target) {
$logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" } $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
$log = Join-Path $LogDir "$task$logSuffix.binlog" $log = Join-Path $LogDir "$task$logSuffix.binlog"
$outputPath = Join-Path $ToolsetDir "$task\" $outputPath = Join-Path $ToolsetDir "$task\\"
MSBuild $taskProject ` MSBuild $taskProject `
/bl:$log ` /bl:$log `
...@@ -64,7 +64,7 @@ try { ...@@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
} }
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.10.0-preview2" -MemberType NoteProperty $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.8.0-preview3" -MemberType NoteProperty
} }
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
......
eng/common/sdl/execute-all-sdl-tools.ps1
浏览文件 @ 8340546b
...@@ -32,7 +32,7 @@ try { ...@@ -32,7 +32,7 @@ try {
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0 Set-StrictMode -Version 2.0
$disableConfigureToolsetImport = $true $disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0 $LASTEXITCODE = 0
# `tools.ps1` checks $ci to perform some actions. Since the SDL # `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the # scripts don't necessarily execute in the same agent that run the
......
eng/common/sdl/init-sdl.ps1
浏览文件 @ 8340546b
...@@ -10,7 +10,7 @@ Param( ...@@ -10,7 +10,7 @@ Param(
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0 Set-StrictMode -Version 2.0
$disableConfigureToolsetImport = $true $disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0 $LASTEXITCODE = 0
# `tools.ps1` checks $ci to perform some actions. Since the SDL # `tools.ps1` checks $ci to perform some actions. Since the SDL
# scripts don't necessarily execute in the same agent that run the # scripts don't necessarily execute in the same agent that run the
......
eng/common/sdl/run-sdl.ps1
浏览文件 @ 8340546b
...@@ -13,7 +13,7 @@ Param( ...@@ -13,7 +13,7 @@ Param(
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0 Set-StrictMode -Version 2.0
$disableConfigureToolsetImport = $true $disableConfigureToolsetImport = $true
$global:LASTEXITCODE = 0 $LASTEXITCODE = 0
try { try {
# `tools.ps1` checks $ci to perform some actions. Since the SDL # `tools.ps1` checks $ci to perform some actions. Since the SDL
......
eng/common/templates/job/onelocbuild.yml
浏览文件 @ 8340546b
...@@ -18,9 +18,6 @@ parameters: ...@@ -18,9 +18,6 @@ parameters:
LclSource: lclFilesInRepo LclSource: lclFilesInRepo
LclPackageId: '' LclPackageId: ''
RepoType: gitHub RepoType: gitHub
GitHubOrg: dotnet
MirrorRepo: ''
MirrorBranch: main
condition: '' condition: ''
jobs: jobs:
...@@ -69,11 +66,6 @@ jobs: ...@@ -69,11 +66,6 @@ jobs:
${{ if eq(parameters.RepoType, 'gitHub') }}: ${{ if eq(parameters.RepoType, 'gitHub') }}:
repoType: ${{ parameters.RepoType }} repoType: ${{ parameters.RepoType }}
gitHubPatVariable: "${{ parameters.GithubPat }}" gitHubPatVariable: "${{ parameters.GithubPat }}"
${{ if ne(parameters.MirrorRepo, '') }}:
isMirrorRepoSelected: true
gitHubOrganization: ${{ parameters.GitHubOrg }}
mirrorRepo: ${{ parameters.MirrorRepo }}
mirrorBranch: ${{ parameters.MirrorBranch }}
condition: ${{ parameters.condition }} condition: ${{ parameters.condition }}
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
......
eng/common/tools.ps1
浏览文件 @ 8340546b
...@@ -193,42 +193,38 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { ...@@ -193,42 +193,38 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
return $global:_DotNetInstallDir = $dotnetRoot return $global:_DotNetInstallDir = $dotnetRoot
} }
function Retry($downloadBlock, $maxRetries = 5) {
$retries = 1
while($true) {
try {
& $downloadBlock
break
}
catch {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
}
if (++$retries -le $maxRetries) {
$delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
Start-Sleep -Seconds $delayInSeconds
}
else {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
break
}
}
}
function GetDotNetInstallScript([string] $dotnetRoot) { function GetDotNetInstallScript([string] $dotnetRoot) {
$installScript = Join-Path $dotnetRoot 'dotnet-install.ps1' $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1'
if (!(Test-Path $installScript)) { if (!(Test-Path $installScript)) {
Create-Directory $dotnetRoot Create-Directory $dotnetRoot
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
$maxRetries = 5
$retries = 1
$uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1"
Retry({ while($true) {
Write-Host "GET $uri" try {
Invoke-WebRequest $uri -OutFile $installScript Write-Host "GET $uri"
}) Invoke-WebRequest $uri -OutFile $installScript
break
}
catch {
Write-Host "Failed to download '$uri'"
Write-Error $_.Exception.Message -ErrorAction Continue
}
if (++$retries -le $maxRetries) {
$delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
Start-Sleep -Seconds $delayInSeconds
}
else {
throw "Unable to download file in $maxRetries attempts."
}
}
} }
return $installScript return $installScript
...@@ -312,8 +308,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = ...@@ -312,8 +308,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
# If the version of msbuild is going to be xcopied, # If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here: # use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.10.0-preview2&view=overview # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.8.0-preview3&view=overview
$defaultXCopyMSBuildVersion = '16.10.0-preview2' $defaultXCopyMSBuildVersion = '16.8.0-preview3'
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
$vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr }
...@@ -407,13 +403,9 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { ...@@ -407,13 +403,9 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
} }
Create-Directory $packageDir Create-Directory $packageDir
Write-Host "Downloading $packageName $packageVersion" Write-Host "Downloading $packageName $packageVersion"
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
Retry({ Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
})
Unzip $packagePath $packageDir Unzip $packagePath $packageDir
} }
...@@ -450,9 +442,27 @@ function LocateVisualStudio([object]$vsRequirements = $null){ ...@@ -450,9 +442,27 @@ function LocateVisualStudio([object]$vsRequirements = $null){
if (!(Test-Path $vsWhereExe)) { if (!(Test-Path $vsWhereExe)) {
Create-Directory $vsWhereDir Create-Directory $vsWhereDir
Write-Host 'Downloading vswhere' Write-Host 'Downloading vswhere'
Retry({ $maxRetries = 5
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe $retries = 1
})
while($true) {
try {
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
break
}
catch{
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_
}
if (++$retries -le $maxRetries) {
$delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff
Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)."
Start-Sleep -Seconds $delayInSeconds
}
else {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
}
}
} }
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
...@@ -488,7 +498,7 @@ function InitializeBuildTool() { ...@@ -488,7 +498,7 @@ function InitializeBuildTool() {
if (Test-Path variable:global:_BuildTool) { if (Test-Path variable:global:_BuildTool) {
# If the requested msbuild parameters do not match, clear the cached variables. # If the requested msbuild parameters do not match, clear the cached variables.
if($global:_BuildTool.Contains('ExcludePrereleaseVS') -and $global:_BuildTool.ExcludePrereleaseVS -ne $excludePrereleaseVS) { if($global:_BuildTool.Contains('ExcludePrereleaseVS') -and $global:_BuildTool.ExcludePrereleaseVS -ne $excludePrereleaseVS) {
Remove-Item variable:global:_BuildTool Remove-Item variable:global:_BuildTool
Remove-Item variable:global:_MSBuildExe Remove-Item variable:global:_MSBuildExe
} else { } else {
return $global:_BuildTool return $global:_BuildTool
...@@ -545,7 +555,7 @@ function GetDefaultMSBuildEngine() { ...@@ -545,7 +555,7 @@ function GetDefaultMSBuildEngine() {
function GetNuGetPackageCachePath() { function GetNuGetPackageCachePath() {
if ($env:NUGET_PACKAGES -eq $null) { if ($env:NUGET_PACKAGES -eq $null) {
# Use local cache on CI to ensure deterministic build. # Use local cache on CI to ensure deterministic build.
# Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116 # Avoid using the http cache as workaround for https://github.com/NuGet/Home/issues/3116
# use global cache in dev builds to avoid cost of downloading packages. # use global cache in dev builds to avoid cost of downloading packages.
# For directory normalization, see also: https://github.com/NuGet/Home/issues/7968 # For directory normalization, see also: https://github.com/NuGet/Home/issues/7968
...@@ -702,10 +712,7 @@ function MSBuild-Core() { ...@@ -702,10 +712,7 @@ function MSBuild-Core() {
} }
foreach ($arg in $args) { foreach ($arg in $args) {
if ($null -ne $arg -and $arg.Trim() -ne "") { if ($arg -ne $null -and $arg.Trim() -ne "") {
if ($arg.EndsWith('\')) {
$arg = $arg + "\"
}
$cmdArgs += " `"$arg`"" $cmdArgs += " `"$arg`""
} }
} }
...@@ -777,7 +784,7 @@ function Get-Darc($version) { ...@@ -777,7 +784,7 @@ function Get-Darc($version) {
. $PSScriptRoot\pipeline-logging-functions.ps1 . $PSScriptRoot\pipeline-logging-functions.ps1
$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..\') $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..')
$EngRoot = Resolve-Path (Join-Path $PSScriptRoot '..') $EngRoot = Resolve-Path (Join-Path $PSScriptRoot '..')
$ArtifactsDir = Join-Path $RepoRoot 'artifacts' $ArtifactsDir = Join-Path $RepoRoot 'artifacts'
$ToolsetDir = Join-Path $ArtifactsDir 'toolset' $ToolsetDir = Join-Path $ArtifactsDir 'toolset'
......
eng/common/tools.sh
浏览文件 @ 8340546b
...@@ -485,14 +485,13 @@ _script_dir=`dirname "$_ResolvePath"` ...@@ -485,14 +485,13 @@ _script_dir=`dirname "$_ResolvePath"`
eng_root=`cd -P "$_script_dir/.." && pwd` eng_root=`cd -P "$_script_dir/.." && pwd`
repo_root=`cd -P "$_script_dir/../.." && pwd` repo_root=`cd -P "$_script_dir/../.." && pwd`
repo_root="${repo_root}/" artifacts_dir="$repo_root/artifacts"
artifacts_dir="${repo_root}artifacts"
toolset_dir="$artifacts_dir/toolset" toolset_dir="$artifacts_dir/toolset"
tools_dir="${repo_root}.tools" tools_dir="$repo_root/.tools"
log_dir="$artifacts_dir/log/$configuration" log_dir="$artifacts_dir/log/$configuration"
temp_dir="$artifacts_dir/tmp/$configuration" temp_dir="$artifacts_dir/tmp/$configuration"
global_json_file="${repo_root}global.json" global_json_file="$repo_root/global.json"
# determine if global.json contains a "runtimes" entry # determine if global.json contains a "runtimes" entry
global_json_has_runtimes=false global_json_has_runtimes=false
if command -v jq &> /dev/null; then if command -v jq &> /dev/null; then
...@@ -505,7 +504,7 @@ fi ...@@ -505,7 +504,7 @@ fi
# HOME may not be defined in some scenarios, but it is required by NuGet # HOME may not be defined in some scenarios, but it is required by NuGet
if [[ -z $HOME ]]; then if [[ -z $HOME ]]; then
export HOME="${repo_root}artifacts/.home/" export HOME="$repo_root/artifacts/.home/"
mkdir -p "$HOME" mkdir -p "$HOME"
fi fi
......
global.json
浏览文件 @ 8340546b
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
"python3": "3.7.1" "python3": "3.7.1"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21311.3", "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21304.1",
"Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21311.3", "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21304.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21311.3", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21304.1",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21311.3", "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21304.1",
"Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23", "Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21314.1" "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21307.1"
} }
} }
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或