Skip to content

Commit cbce51f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240520.3 (#9142)
[main] Update dependencies from dotnet/arcade
1 parent f704647 commit cbce51f

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,25 @@
157157
</Dependency>
158158
</ProductDependencies>
159159
<ToolsetDependencies>
160-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
160+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24270.3">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
162+
<Sha>1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24266.1">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24270.3">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
166+
<Sha>1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24266.1">
168+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24270.3">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
170+
<Sha>1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10</Sha>
171171
</Dependency>
172172
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174174
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24266.1">
176+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24270.3">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
178+
<Sha>1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
181181
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- Packages that come from https://github.com/dotnet/arcade -->
5050
<PropertyGroup>
5151
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
52-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24270.3</MicrosoftDotNetCodeAnalysisPackageVersion>
5353
</PropertyGroup>
5454
<!-- Sourcelink -->
5555
<PropertyGroup>

‎eng/common/internal/Directory.Build.props‎

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24266.1",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24266.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24270.3",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24270.3"
1717
},
1818
"sdk": {
1919
"version": "9.0.100-preview.3.24204.13"

0 commit comments

Comments
 (0)