Skip to content

Commit bbe185f

Browse files
dotnet-maestro-botdotnet-botdotnet-maestro[bot]JanKrivanek
authored
[automated] Merge branch 'vs17.9' => 'main' (#9577)
* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8840417 (#9566) * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8840161 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8840161 * Update dependencies from https://github.com/dotnet/arcade build 20231220.2 (#9574) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23580.1 -> To Version 8.0.0-beta.23620.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * [vs17.9] Update dependencies from nuget/nuget.client dotnet/roslyn (#9575) * Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.67 NuGet.Build.Tasks From Version 6.9.0-preview.1.64 -> To Version 6.9.0-preview.1.67 * Update dependencies from https://github.com/dotnet/roslyn build 20231221.4 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23615.7 -> To Version 4.9.0-3.23621.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * [vs17.9] Update dependencies from nuget/nuget.client dotnet/roslyn (#9580) * Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.70 NuGet.Build.Tasks From Version 6.9.0-preview.1.67 -> To Version 6.9.0-preview.1.70 * Update dependencies from https://github.com/dotnet/roslyn build 20231229.3 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23621.4 -> To Version 4.9.0-3.23629.3 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> --------- Co-authored-by: dotnet bot <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Krivanek <[email protected]>
1 parent b860fe5 commit bbe185f

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,28 @@
6666
</Dependency>
6767
</ProductDependencies>
6868
<ToolsetDependencies>
69-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23580.1">
69+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23620.2">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>efc3da96e5ac110513e92ebd9ef87c73f44d8540</Sha>
71+
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
7272
<SourceBuild RepoName="arcade" ManagedOnly="true" />
7373
</Dependency>
7474
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
7575
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
7676
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
7777
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
7878
</Dependency>
79-
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.64">
79+
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.70">
8080
<Uri>https://github.com/nuget/nuget.client</Uri>
81-
<Sha>2a234707a663f731e4de93cba4014ed1a8259def</Sha>
81+
<Sha>6a82332d4936d893fb1e22fd86f2e3cb4d54c471</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23615.7">
83+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23629.3">
8484
<Uri>https://github.com/dotnet/roslyn</Uri>
85-
<Sha>6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51</Sha>
85+
<Sha>ebb588725e707db23d8723b633258e7eb918277b</Sha>
8686
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
8787
</Dependency>
88-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1">
88+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23620.2">
8989
<Uri>https://github.com/dotnet/arcade</Uri>
90-
<Sha>efc3da96e5ac110513e92ebd9ef87c73f44d8540</Sha>
90+
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
9191
</Dependency>
9292
</ToolsetDependencies>
9393
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
Otherwise, this version of dotnet will not be installed and the build will error out. -->
5050
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
5151
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
52-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23580.1</MicrosoftDotNetXUnitExtensionsVersion>
52+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23620.2</MicrosoftDotNetXUnitExtensionsVersion>
5353
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
5454
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
55-
<MicrosoftNetCompilersToolsetVersion>4.9.0-3.23615.7</MicrosoftNetCompilersToolsetVersion>
56-
<NuGetBuildTasksVersion>6.9.0-preview.1.64</NuGetBuildTasksVersion>
55+
<MicrosoftNetCompilersToolsetVersion>4.9.0-3.23629.3</MicrosoftNetCompilersToolsetVersion>
56+
<NuGetBuildTasksVersion>6.9.0-preview.1.70</NuGetBuildTasksVersion>
5757
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
5858
<SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
5959
</PropertyGroup>

eng/common/templates/job/job.yml

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/templates/job/publish-build-assets.yml

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/templates/post-build/post-build.yml

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

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"xcopy-msbuild": "17.8.1-2"
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23580.1"
13+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23620.2"
1414
}
1515
}

src/MSBuild/Resources/xlf/Strings.tr.xlf

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)