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

Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24556.1 #44685

Merged
merged 12 commits into from
Nov 7, 2024
Merged

Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24556.1 #44685

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cf56534
Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24556.1
dotnet-sb-bot Nov 6, 2024
5978dfe
Set NetCurrent consistently for all projects
ViktorHofer Nov 6, 2024
8025fd6
arcade net10.0 patch
mthalman Nov 6, 2024
db7db33
update arcade patch
mthalman Nov 6, 2024
ebaf6ca
Patch to update nuget-client to net10.0 TFM
mthalman Nov 6, 2024
cec1325
aspnetcore patch to target net10.0
mthalman Nov 6, 2024
934e9bd
Unpin runtime dependencies
mthalman Nov 6, 2024
ffb9c23
Fix nuget patch
mthalman Nov 7, 2024
21e1557
Runtime patch
mthalman Nov 7, 2024
e9d00f9
Update prebuilts tarball version
mthalman Nov 7, 2024
5206c52
Add backport info to runtime patch
mthalman Nov 7, 2024
d7538c1
Merge branch 'main' into nov2024-source-build-1730902862
mthalman Nov 7, 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
2 changes: 2 additions & 0 deletions src/SourceBuild/content/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@
<Import Project="$(RepositoryEngineeringDir)Versions.props" Condition="'$(SkipArcadeSdkImport)' == 'true'" />

<PropertyGroup>
<!-- TODO: Remove when Arcade updated NetCurrent to net10.0. -->
<NetCurrent>net10.0</NetCurrent>
<!-- We have no projects targeting multiple frameworks, so don't include in output path. -->
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<!-- This repo's projects are entirely infrastructure and do not ship. -->
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24522.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24551.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
are not necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltSdkVersion>9.0.100-rc.2.24474.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.100-rc.2.24474.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltSdkVersion>10.0.100-alpha.1.24556.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>10.0.100-alpha.1.24556.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltPrebuiltsVersion>0.1.0-10.0.100-4</PrivateSourceBuiltPrebuiltsVersion>
<!-- command-line-api dependencies -->
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"tools": {
"dotnet": "10.0.100-alpha.1.24551.9"
"dotnet": "10.0.100-alpha.1.24555.54"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24522.1"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1"
}
}
Loading