Skip to content

[vs17.12] Update dependencies from dotnet/arcade #11034

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

Merged
JanKrivanek merged 13 commits into from
Dec 10, 2024
Merged

[vs17.12] Update dependencies from dotnet/arcade #11034

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
60f95c1
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 25, 2024
5fd1d90
Update version prefix to 17.12.14
GangWang01 Nov 26, 2024
06adae8
Update BootstrapSdkVersion
JanKrivanek Dec 4, 2024
cf22e02
Decreasing severity of IDE0306
JanKrivanek Dec 4, 2024
6592bc0
Decrease IDE0303 severity
JanKrivanek Dec 4, 2024
ff34407
Merge branch 'vs17.12' into darc-vs17.12-13c05f00-ae90-440f-baf7-9a33…
GangWang01 Dec 5, 2024
3baf5c5
Update cibuild_bootstrapped_msbuild.ps1
JanKrivanek Dec 5, 2024
7216623
Update cibuild_bootstrapped_msbuild.sh
JanKrivanek Dec 5, 2024
40be07a
Merge branch 'vs17.12' into darc-vs17.12-13c05f00-ae90-440f-baf7-9a33…
JanKrivanek Dec 5, 2024
aa89c4d
Update InstallDotNetCoreTask.cs
JanKrivanek Dec 5, 2024
21fd79e
Fix the bootstrap sdk version
JanKrivanek Dec 6, 2024
d518e5e
Merge branch 'vs17.12' into darc-vs17.12-13c05f00-ae90-440f-baf7-9a33…
JanKrivanek Dec 10, 2024
6bbb132
Bump version
JanKrivanek Dec 10, 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
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20241… 
…122.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24562.13 -> To Version 9.0.0-beta.24572.2
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed Nov 25, 2024
commit 60f95c18dc1ff1ca1bc2129c73a1dde15c843bf9
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 @@ -71,19 +71,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24562.13">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24562.13">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24562.13">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</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.24562.13">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1c7e09a8d9c9c9b15ba574cd6a496553505559de</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
5 changes: 3 additions & 2 deletions eng/Versions.props
View file
Open in desktop
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.13</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<VersionPrefix>17.12.13</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.24562.13</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24572.2</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/sdk-task.ps1
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/tools.ps1
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 global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"allowPrerelease": true
},
"tools": {
"dotnet": "9.0.100-rc.2.24474.11",
"dotnet": "9.0.100",
"vs": {
"version": "17.10.0"
},
"xcopy-msbuild": "17.10.0-pre.4.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2"
}
}
Loading