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

[main] Update dependencies from dotnet/arcade #111327

Closed
Closed
92 changes: 46 additions & 46 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,87 +84,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25058.4">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25058.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25060.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -348,9 +348,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3119edb6d70fb252e6128b0c7e45d3fc2f49f249</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25058.4">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25076.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25067.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down Expand Up @@ -402,14 +402,14 @@
<Sha>557c46c532788c16881dbe1b9bd3d938c2ed22e0</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-alpha.1.24622.2">
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-alpha.1.25079.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>13330d5ded0b2b2bcd6459d6a410aa6220b11040</Sha>
<Sha>b445afaca29f85fa9aee89482a03f06b0c7be810</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="10.0.100-alpha.1.24622.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="10.0.100-alpha.1.25079.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>13330d5ded0b2b2bcd6459d6a410aa6220b11040</Sha>
<Sha>b445afaca29f85fa9aee89482a03f06b0c7be810</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25067.2">
Expand Down
34 changes: 17 additions & 17 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,24 @@
<PropertyGroup>
<StaticCsVersion>0.2.0</StaticCsVersion>
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24622.2</MicrosoftDotNetApiCompatTaskVersion>
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.25079.6</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25058.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25058.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25058.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25058.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25058.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25076.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25076.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25076.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25076.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25076.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25076.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25076.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25076.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25076.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25076.1</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
10 changes: 0 additions & 10 deletions eng/common/internal/Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,6 @@
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
</ItemGroup>
<PropertyGroup>
<RestoreSources></RestoreSources>
<RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
</RestoreSources>
<RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
$(RestoreSources);
https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
</RestoreSources>
</PropertyGroup>

<!-- Repository extensibility point -->
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }

# Enable repos to use a particular version of the on-line dotnet-install scripts.
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }

# True to use global NuGet cache instead of restoring packages to repository-local directory.
Expand Down Expand Up @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
if (!(Test-Path $installScript)) {
Create-Directory $dotnetRoot
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"

Retry({
Write-Host "GET $uri"
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}

# Enable repos to use a particular version of the on-line dotnet-install scripts.
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}

# True to use global NuGet cache instead of restoring packages to repository-local directory.
Expand Down Expand Up @@ -295,7 +295,7 @@ function with_retries {
function GetDotNetInstallScript {
local root=$1
local install_script="$root/dotnet-install.sh"
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh"

if [[ ! -a "$install_script" ]]; then
mkdir -p "$root"
Expand Down
10 changes: 5 additions & 5 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "10.0.100-alpha.1.24610.7",
"version": "10.0.100-alpha.1.25074.2",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "10.0.100-alpha.1.24610.7"
"dotnet": "10.0.100-alpha.1.25074.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25076.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25076.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25076.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25057.24"
Expand Down
Loading