Skip to content

Commit b26ee62

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20240520.3 (#5547)
[main] Update dependencies from dotnet/arcade
1 parent d3172db commit b26ee62

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24270.3">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
9+
<Sha>1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24266.1">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24270.3">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
13+
<Sha>1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24266.1">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24270.3">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
17+
<Sha>1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24270.3</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24270.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
22
<Project>
33

4+
<PropertyGroup>
5+
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
6+
<ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
7+
</PropertyGroup>
8+
49
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
510

611
</Project>

eng/common/internal/Tools.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
<PropertyGroup>
55
<TargetFramework>net472</TargetFramework>
6-
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
76
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
87
</PropertyGroup>
98
<ItemGroup>

eng/common/tools.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ function Retry($downloadBlock, $maxRetries = 5) {
254254
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts."
255255
break
256256
}
257-
258257
}
259258
}
260259

@@ -424,7 +423,6 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
424423

425424
InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion
426425
} else {
427-
428426
if (Get-Member -InputObject $GlobalJson.tools -Name 'xcopy-msbuild') {
429427
$xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild'
430428
$vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0]
@@ -504,6 +502,10 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
504502
Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
505503
})
506504

505+
if (!(Test-Path $packagePath)) {
506+
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "See https://dev.azure.com/dnceng/internal/_wiki/wikis/DNCEng%20Services%20Wiki/1074/Updating-Microsoft.DotNet.Arcade.MSBuild.Xcopy-WAS-RoslynTools.MSBuild-(xcopy-msbuild)-generation?anchor=troubleshooting for help troubleshooting issues with XCopy MSBuild"
507+
throw
508+
}
507509
Unzip $packagePath $packageDir
508510
}
509511

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "9.0.100-preview.3.24204.13"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24266.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24270.3",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)