Skip to content

[main] Update dependencies from dotnet/arcade #44429

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
merged 3 commits into from
Oct 24, 2024
Merged

[main] Update dependencies from dotnet/arcade #44429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12a2dd7
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 24, 2024
c999c99
Merge changes from https://github.com/dotnet/sdk/pull/43479
ViktorHofer Oct 24, 2024
840acce
Merge branch 'main' into darc-main-be2eaf3a-a16f-4648-94a9-34774db3d477
ViktorHofer Oct 24, 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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,34 +597,34 @@
</Dependency>
</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.24523.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
<Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24522.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24523.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
<Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24522.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24523.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
<Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24522.1">
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24523.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
<Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24522.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24523.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
<Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24522.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24523.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
<Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24522.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24523.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
<Sha>89040b649a6aa8fa9b6bd6ddaad5a637cf091b07</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24522.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24522.1</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24522.1</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24522.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24523.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24523.2</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24523.2</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24523.2</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
6 changes: 3 additions & 3 deletions eng/restore-toolset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function InitializeCustomSDKToolset {

# The following frameworks and tools are used only for testing.
# Do not attempt to install them in source build.
if [[ $properties == *"ArcadeBuildFromSource=true"* || $product_build == true || $properties == *"DotNetBuildRepo=true"* ]]; then
if [[ $product_build == true || $properties == *"DotNetBuildRepo=true"* ]]; then
return
fi

Expand All @@ -20,7 +20,7 @@ function InitializeCustomSDKToolset {
fi

InitializeDotNetCli true

InstallDotNetSharedFramework "6.0.0"
InstallDotNetSharedFramework "7.0.0"
InstallDotNetSharedFramework "8.0.0"
Expand All @@ -31,7 +31,7 @@ function InitializeCustomSDKToolset {
# Installs additional shared frameworks for testing purposes
function InstallDotNetSharedFramework {
local version=$1
local dotnet_root=$DOTNET_INSTALL_DIR
local dotnet_root=$DOTNET_INSTALL_DIR
local fx_dir="$dotnet_root/shared/Microsoft.NETCore.App/$version"

if [[ ! -d "$fx_dir" ]]; then
Expand Down
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 @@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24522.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24522.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24523.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24523.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
Expand Down
8 changes: 1 addition & 7 deletions src/SourceBuild/content/repo-projects/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@

<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<BuildArgs>$(BuildArgs) /p:SourceBuiltSymbolsDir=$(IntermediateSymbolsRepoDir)</BuildArgs>
<BuildArgs>$(BuildArgs) /p:ArcadeBuildFromSource=true</BuildArgs>
<BuildArgs>$(BuildArgs) /p:DotNetBuildSourceOnly=true</BuildArgs>
<BuildArgs>$(BuildArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PrebuiltSourceBuiltPackagesPath)"</BuildArgs>
<BuildArgs>$(BuildArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)"</BuildArgs>
Expand Down Expand Up @@ -150,24 +149,19 @@
See https://github.com/dotnet/source-build/issues/541 -->
<EnvironmentVariables Include="MSBUILDDISABLENODEREUSE=1" />

</ItemGroup>

<ItemGroup>
<EnvironmentVariables Include="DeterministicSourcePaths=true" Condition="'$(DeterministicBuildOptOut)' != 'true'" />
<EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" />

<EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" />
<EnvironmentVariables Include="DotNetBuildFromSourceFlavor=Product" />

<!-- Need to be passed in as an env var so that custom Exec tasks in the repo's SourceBuild.props receive this setting. -->
<!-- Need to be passed in as an env var so that custom Exec tasks in the repo's DotNetBuild.props receive this setting. -->
<EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />

<!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
<EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" Condition="'$(NuGetConfigFile)' != ''" />
</ItemGroup>

<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<EnvironmentVariables Include="DotNetBuildFromSource=true" />
<EnvironmentVariables Include="NuGetAudit=false" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/repo-projects/fsharp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<!--
dotnet/fsharp has a custom eng/build.sh script that handles its own sourcebuild arg
differently from the ArcadeBuildFromSource MSBuild arg. Including both args is fine, but the
differently from the standard MSBuild arg set. Including both args is fine, but the
custom sourcebuild arg is the one that's required. This avoids running bootstrapping twice.
-->
<BuildArgs Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)sourcebuild $(FlagParameterPrefix)tfm $(NetCurrent) /p:SourceBuildBootstrapTfm=$(NetCurrent)</BuildArgs>
Expand Down
Loading