Skip to content

Commit e657d4d

Browse files
JanProvaznikdotnet-maestro[bot]JaynieBai
authored
[vs17.8] update arcade and fix build (#10838)
* Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23423.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk * remove BuildXL from nuget config * compatibility suppressions * Update dependencies from https://github.com/dotnet/arcade build 20241… Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1 * include PortableRuntimeIdentifierGraph.json * Suppress a warning IDE0305 * bump version --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <[email protected]>
1 parent 4c8a0ca commit e657d4d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+999
-333
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,3 +408,4 @@ dotnet_diagnostic.IDE0290.severity = suggestion
408408
# Collection initialization can be simplified
409409
dotnet_diagnostic.IDE0300.severity = suggestion
410410
dotnet_diagnostic.IDE0301.severity = suggestion
411+
dotnet_diagnostic.IDE0305.severity = suggestion

‎NuGet.config‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,31 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-2aade6b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-2/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
12+
<!-- End: Package sources from dotnet-runtime -->
13+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
514
<add key="arcade" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
615
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
716
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
817
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
918
<add key="dotnet8" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json" />
1019
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
11-
<add key="BuildXL" value="https://pkgs.dev.azure.com/ms/BuildXL/_packaging/BuildXL/nuget/v3/index.json" />
1220
</packageSources>
13-
<disabledPackageSources />
21+
<disabledPackageSources>
22+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
23+
<!-- Begin: Package sources from dotnet-runtime -->
24+
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
25+
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
26+
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
27+
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
28+
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
29+
<!-- End: Package sources from dotnet-runtime -->
30+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
31+
</disabledPackageSources>
1432
</configuration>

‎eng/BootStrapMSBuild.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<_NuGetRuntimeDependencies Include="%(None.Identity)" Condition="'@(None->Contains('NuGet.'))' == 'true'" />
4646

4747
<_NuGetRuntimeDependencies Include="$(DOTNET_INSTALL_DIR)\sdk\$(DotNetCliVersion)\RuntimeIdentifierGraph.json" />
48+
<_NuGetRuntimeDependencies Include="$(DOTNET_INSTALL_DIR)\sdk\$(DotNetCliVersion)\PortableRuntimeIdentifierGraph.json" />
4849
</ItemGroup>
4950
</Target>
5051

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262
</Dependency>
6363
</ProductDependencies>
6464
<ToolsetDependencies>
65-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23425.2">
65+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>90c167d5c57de4a8bced566379dbd893556c94e8</Sha>
67+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
6868
<SourceBuild RepoName="arcade" ManagedOnly="true" />
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23423.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
70+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
7171
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
72-
<Sha>ed9a83526483c094fb51e7000b6f816ce6cb0325</Sha>
72+
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
7373
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
7474
</Dependency>
7575
<Dependency Name="NuGet.Build.Tasks" Version="6.8.0-rc.112">
@@ -81,9 +81,9 @@
8181
<Sha>dc3d0694a4b31b8e27038431888cd4e8dd5b6cb6</Sha>
8282
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
8383
</Dependency>
84-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23425.2">
84+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24516.1">
8585
<Uri>https://github.com/dotnet/arcade</Uri>
86-
<Sha>90c167d5c57de4a8bced566379dbd893556c94e8</Sha>
86+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
8787
</Dependency>
8888
</ToolsetDependencies>
8989
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
44
<PropertyGroup>
5-
<VersionPrefix>17.8.8</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
5+
<VersionPrefix>17.8.9</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
66
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
77
<AssemblyVersion>15.1.0.0</AssemblyVersion>
88
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
@@ -48,7 +48,7 @@
4848
Otherwise, this version of dotnet will not be installed and the build will error out. -->
4949
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
5050
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
51-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23425.2</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsVersion>
5252
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
5353
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
5454
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23465.5</MicrosoftNetCompilersToolsetVersion>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eng/common/cross/toolchain.cmake‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eng/common/native/init-compiler.sh‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eng/common/post-build/publish-using-darc.ps1‎

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eng/common/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)