Skip to content

[main] Update dependencies from dotnet/arcade #64376

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

Closed
dotnet-maestro wants to merge 6 commits into from
Closed

[main] Update dependencies from dotnet/arcade #64376

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bfb3d1a
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jan 27, 2022
e3a8136
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jan 28, 2022
0bc38cf
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jan 29, 2022
e9045a7
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jan 31, 2022
19c261c
Merge branch 'main' into darc-main-10eb29b9-daec-4463-98b5-b613fbbe7c5e
akoeplinger Feb 1, 2022
42b6cb5
Merge remote-tracking branch 'upstream/main' into darc-main-10eb29b9-…
akoeplinger Feb 3, 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
Prev Previous commit
Merge remote-tracking branch 'upstream/main' into darc-main-10eb29b9-… 
…daec-4463-98b5-b613fbbe7c5e

# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
#	global.json
  • Loading branch information
@akoeplinger
akoeplinger committed Feb 3, 2022
commit 42b6cb568a7849945ea53e8f7a29c4efebe16115
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="7.0.0-beta.22080.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22102.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22102.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22080.1</MicrosoftDotNetRemoteExecutorVersion>
Expand Down
1 change: 0 additions & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22080.1",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22080.1",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.