Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'vs17.9' => 'main' #9577

Merged
merged 7 commits into from
Jan 3, 2024
Merged

[automated] Merge branch 'vs17.9' => 'main' #9577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d57486
Localized file check-in by OneLocBuild Task: Build definition ID 9434…
dotnet-bot Dec 29, 2023
2018f34
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 29, 2023
8a98e3a
[vs17.9] Update dependencies from nuget/nuget.client dotnet/roslyn (#…
dotnet-maestro[bot] Dec 29, 2023
cef9881
Merge branch 'main' into merge/vs17.9-to-main
JanKrivanek Jan 2, 2024
8ab35c5
[vs17.9] Update dependencies from nuget/nuget.client dotnet/roslyn (#…
dotnet-maestro[bot] Jan 3, 2024
84a4b57
Merge branch 'vs17.9' into merge/vs17.9-to-main
JanKrivanek Jan 3, 2024
aac04d2
Merge branch 'main' into merge/vs17.9-to-main
JanKrivanek Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,28 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23580.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23620.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>efc3da96e5ac110513e92ebd9ef87c73f44d8540</Sha>
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.64">
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.70">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>2a234707a663f731e4de93cba4014ed1a8259def</Sha>
<Sha>6a82332d4936d893fb1e22fd86f2e3cb4d54c471</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23615.7">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23629.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51</Sha>
<Sha>ebb588725e707db23d8723b633258e7eb918277b</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23620.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>efc3da96e5ac110513e92ebd9ef87c73f44d8540</Sha>
<Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
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>8.0.0-beta.23580.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23620.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
<MicrosoftNetCompilersToolsetVersion>4.9.0-3.23615.7</MicrosoftNetCompilersToolsetVersion>
<NuGetBuildTasksVersion>6.9.0-preview.1.64</NuGetBuildTasksVersion>
<MicrosoftNetCompilersToolsetVersion>4.9.0-3.23629.3</MicrosoftNetCompilersToolsetVersion>
<NuGetBuildTasksVersion>6.9.0-preview.1.70</NuGetBuildTasksVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/job.yml
View file
Open in desktop

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/job/publish-build-assets.yml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions eng/common/templates/post-build/post-build.yml
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"xcopy-msbuild": "17.8.1-2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23580.1"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23620.2"
}
}
2 changes: 1 addition & 1 deletion src/MSBuild/Resources/xlf/Strings.tr.xlf
View file
Open in desktop

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