Skip to content

Commit

Permalink
[vs17.12] Update dependencies from dotnet/arcade (#10993)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20241112.13

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24516.2 -> To Version 9.0.0-beta.24562.13

* Update VersionPrefix to 17.12.10

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
  • Loading branch information
3 people authored Nov 20, 2024
1 parent 43a2496 commit 6ee3f9a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 24 deletions.
10 changes: 0 additions & 10 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<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" />
<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" />
<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" />
<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" />
<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" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="arcade" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -22,11 +17,6 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
18 changes: 9 additions & 9 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24562.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24562.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24562.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.12.0-rc.106">
<Uri>https://github.com/nuget/nuget.client</Uri>
Expand All @@ -98,9 +98,9 @@
<Sha>df4ae6b81013ac45367372176b9c3135a35a7e3c</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24562.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
</Dependencies>
5 changes: 3 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<!-- 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. -->
<Project>
<PropertyGroup>
<VersionPrefix>17.12.9</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<VersionPrefix>17.12.10</VersionPrefix>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.11.4</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
Expand Down Expand Up @@ -49,7 +50,7 @@
Otherwise, this version of dotnet will not be installed and the build will error out. -->
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24516.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24562.13</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24463.9</MicrosoftNetCompilersToolsetVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/steps/get-delegation-sas.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/common/templates/steps/get-delegation-sas.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"xcopy-msbuild": "17.10.0-pre.4.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13"
}
}

0 comments on commit 6ee3f9a

Please sign in to comment.