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

[main] Update dependencies from dotnet/arcade #6251

Merged
merged 17 commits into from
Dec 21, 2022
Merged

[main] Update dependencies from dotnet/arcade #6251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e085029
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 5, 2022
c8e2067
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 24, 2022
20d0e07
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 25, 2022
c0fcc50
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 26, 2022
3196704
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 29, 2022
45da5e3
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Nov 30, 2022
459e766
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 6, 2022
557cf80
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 7, 2022
09494ff
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 9, 2022
128b8b9
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 11, 2022
94ef60e
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 12, 2022
a5716e0
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 13, 2022
df0a1d2
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 14, 2022
f8cfde8
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 16, 2022
32949f5
Merge branch 'main' into darc-main-5cc5c681-31dd-4dce-8772-eb975cb8b9e7
mavasani Dec 21, 2022
c539ea8
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 21, 2022
0bd1c49
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Dec 21, 2022
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
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
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22552.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22554.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5be556106f26f171f32187951b9a141f9580d03a</Sha>
<Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
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.2.1" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -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 @@ -365,8 +365,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/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview
$defaultXCopyMSBuildVersion = '17.2.1'
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview
$defaultXCopyMSBuildVersion = '17.3.1'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"rollForward": "patch"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22552.1"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22554.2"
}
}