Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20240…
Browse files Browse the repository at this point in the history
…202.4 (dotnet#421)

[dotnet/main] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Feb 5, 2024
1 parent b341768 commit 0664e5d
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24076.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>66c9c5397d599af40f2a94989241944f5a73442a</Sha>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24076.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>66c9c5397d599af40f2a94989241944f5a73442a</Sha>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24076.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24102.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>66c9c5397d599af40f2a94989241944f5a73442a</Sha>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.34.Node.linux-x64" Version="9.0.0-alpha.1.23471.2">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<MicrosoftNETRuntimeEmscripten3134Nodelinuxx64Version>9.0.0-alpha.1.23471.2</MicrosoftNETRuntimeEmscripten3134Nodelinuxx64Version>
<MicrosoftNETRuntimeEmscripten3134Sdklinuxx64Version>9.0.0-alpha.1.23471.2</MicrosoftNETRuntimeEmscripten3134Sdklinuxx64Version>
<MicrosoftNETRuntimeEmscripten3134Cachelinuxx64Version>9.0.0-alpha.1.23471.2</MicrosoftNETRuntimeEmscripten3134Cachelinuxx64Version>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24076.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24102.4</MicrosoftDotNetBuildTasksPackagingVersion>
</PropertyGroup>
<PropertyGroup>
<WasiSdkVersion>16</WasiSdkVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.5" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/source-index-stage1.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
runAsPublic: false
sourceIndexPackageVersion: 1.0.1-20231213.4
sourceIndexPackageVersion: 1.0.1-20240129.2
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
$defaultXCopyMSBuildVersion = '17.8.1-2'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.5
$defaultXCopyMSBuildVersion = '17.8.5'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24076.5",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24076.5"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24102.4"
}
}

0 comments on commit 0664e5d

Please sign in to comment.