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

Jump to bottom

[main] Update dependencies from dotnet/arcade #4778

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+31 −23
Open

[main] Update dependencies from dotnet/arcade #4778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2352212
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 12, 2024
6f726b0
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 13, 2024
1cf46a9
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 14, 2024
b6c38c1
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 20, 2024
818db85
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 21, 2024
34abeb3
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 24, 2024
f1cb750
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 26, 2024
264b999
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 27, 2024
ab7b1a0
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 28, 2024
58d2a84
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 29, 2024
b316007
add PortableBuild tag
lonitra Dec 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
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,29 +152,29 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24560.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24578.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24560.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24578.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24560.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24578.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24560.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24578.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24560.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24578.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24560.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24578.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>232061b49ae2157efbb83acde9acae79ef3d6d40</Sha>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- arcade -->
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24560.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24560.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24578.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24578.2</MicrosoftDotNetBuildTasksInstallersVersion>
<!-- corefx -->
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>
Expand Down
5 changes: 3 additions & 2 deletions eng/common/core-templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ parameters:
# The name of the job. This is included in the job ID.
# targetRID: ''
# The name of the target RID to use, instead of the one auto-detected by Arcade.
# nonPortable: false
# portableBuild: false
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
# linux-x64), and compiling against distro-provided packages rather than portable ones.
# linux-x64), and compiling against distro-provided packages rather than portable ones. The
# default is portable mode.
# skipPublishValidation: false
# Disables publishing validation. By default, a check is performed to ensure no packages are
# published by source-build.
Expand Down
7 changes: 6 additions & 1 deletion eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ steps:
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
fi
portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
fi
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
Expand All @@ -85,7 +90,7 @@ steps:
$targetRidArgs \
$runtimeOsArgs \
$baseOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
$portableBuildArgs \
/p:DotNetBuildSourceOnly=true \
/p:DotNetBuildRepo=true \
/p:AssetManifestFileName=$assetManifestFileName
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ case "$os" in
brew "cmake"
brew "icu4c"
brew "openssl@3"
brew "pkg-config"
brew "pkgconf"
brew "python3"
brew "pigz"
EOF
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
$defaultXCopyMSBuildVersion = '17.12.0'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
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 @@ -8,8 +8,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24560.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24560.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24578.2",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24578.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down
2 changes: 2 additions & 0 deletions src/windowsdesktop/src/sfx/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppRefVersion)</RuntimeFrameworkVersion>
<GenerateInstallers>true</GenerateInstallers>
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
<!-- Builds are portable by default -->
<PortableBuild Condition="'$(PortableBuild)' != 'false'">true</PortableBuild>
</PropertyGroup>

<!-- Redistribute package content from other nuget packages. -->
Expand Down
Loading