8000 [main] Update dependencies from dotnet/arcade by dotnet-maestro[bot] · Pull Request #342 · dotnet/wpf-test · GitHub
[go: up one dir, main page]
Skip to content

[main] Update dependencies from dotnet/arcade #342

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

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
+13,334 −497
Open

[main] Update dependencies from dotnet/arcade #342

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e4d259c
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 10, 2025
a36d553
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 17, 2025
155acd6
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 24, 2025
4a287c1
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 25, 2025
5596b5f
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Mar 3, 2025
40a37f8
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Mar 10, 2025
e50b435
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Mar 17, 2025
532c487
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Mar 24, 2025
cfcdf25
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Mar 31, 2025
da502c8
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 7, 2025
6380dc4
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 14, 2025
898ba16
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 17, 2025
14eec39
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 21, 2025
bbfa125
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 28, 2025
e4960e6
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] May 5, 2025
b3a8fd8
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] May 12, 2025
94c05e3
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] May 19, 2025
e303b3f
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] May 26, 2025
7cadbaf
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jun 2, 2025
7c59c07
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jun 9, 2025
fddb63a
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jun 16, 2025
769dd9e
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jun 23, 2025
5237cd4
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jun 30, 2025
e22aefc
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jul 7, 2025
02f41d5
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jul 14, 2025
d9776ee
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jul 21, 2025
8354426
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jul 28, 2025
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
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20250… 
…220.6

Microsoft.DotNet.Arcade.Sdk
 From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.25120.6
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed Feb 24, 2025
commit 155acd6f0c3f3603706660180c85ec62cb63698d
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25120.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Wpf.Sdk" Version="6.0.0-preview.5.21220.1">
<Uri>https://github.com/dotnet/wpf</Uri>
Expand Down
9 changes: 4 additions & 5 deletions eng/common/core-templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,11 @@ jobs:
fetchDepth: 3
clean: true

- task: DownloadBuildArtifacts@0
displayName: Download artifact
- task: DownloadPipelineArtifact@2
displayName: Download Asset Manifests
inputs:
artifactName: AssetManifests
downloadPath: '$(Build.StagingDirectory)/Download'
checkDownloadedFiles: true
targetPath: '$(Build.StagingDirectory)/AssetManifests'
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

Expand All @@ -95,7 +94,7 @@ jobs:
scriptLocation: scriptPath
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:OfficialBuildId=$(Build.BuildNumber)
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.12.0" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.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.12.0
$defaultXCopyMSBuildVersion = '17.12.0'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
$defaultXCopyMSBuildVersion = '17.13.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
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-alpha.1.25077.2",
"dotnet": "10.0.100-preview.2.25118.3",
"runtimes": {
"dotnet": [
"2.1.7",
Expand All @@ -12,7 +12,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25120.6",
"Microsoft.DotNet.Arcade.Wpf.Sdk": "6.0.0-alpha.1.21071.6",
"Microsoft.NET.Sdk.WindowsDesktop": "6.0.0-preview.6.21276.7"
},
Expand Down
Loading
0