Skip to content

Merge main-vs-deps back into main #67617

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 18 commits into from
Apr 3, 2023
Merged

Merge main-vs-deps back into main #67617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
03914f4
Merge pull request #67327 from dotnet/merges/release/dev17.6-vs-deps-…
dotnet-bot Mar 16, 2023
3be3329
Merge remote-tracking branch 'upstream/main-vs-deps' into merges/main…
allisonchou Mar 21, 2023
db47b0d
Merge remote-tracking branch 'upstream/main' into merges/main-to-main…
allisonchou Mar 21, 2023
85a5b65
Merge pull request #67331 from dotnet/merges/main-to-main-vs-deps
dotnet-bot Mar 21, 2023
c75d526
Merge pull request #67391 from dotnet/merges/main-to-main-vs-deps
dotnet-bot Mar 21, 2023
21de4b7
Merge pull request #67416 from dotnet/merges/main-to-main-vs-deps
dotnet-bot Mar 21, 2023
875c0ae
Merge pull request #67425 from dotnet/merges/main-to-main-vs-deps
dotnet-bot Mar 21, 2023
cd1a39e
Merge pull request #67431 from dotnet/merges/main-to-main-vs-deps
dotnet-bot Mar 22, 2023
55d866b
Merge pull request #67448 from dotnet/merges/main-to-main-vs-deps
dotnet-bot Mar 22, 2023
4131431
Merge pull request #67452 from dotnet/merges/main-to-main-vs-deps
dotnet-bot Mar 23, 2023
736845e
Merge pull request #67502 from dotnet/merges/release/dev17.6-to-relea…
dotnet-bot Mar 27, 2023
93cf032
Attempt to fix build error
allisonchou Mar 27, 2023
30b6d3f
Merge pull request #67460 from dotnet/merges/main-to-main-vs-deps
dotnet-bot Mar 28, 2023
542fea0
Merge pull request #67509 from dotnet/merges/release/dev17.6-to-relea…
dotnet-bot Mar 28, 2023
8529535
Merge pull request #67508 from dotnet/merges/release/dev17.6-vs-deps-…
dotnet-bot Mar 28, 2023
cacfede
Merge pull request #67512 from dotnet/merges/release/dev17.6-vs-deps-…
dotnet-bot Mar 28, 2023
be7e3a2
Update MSBuild version
allisonchou Mar 29, 2023
4c2b2da
Merge pull request #67513 from dotnet/merges/main-to-main-vs-deps
dotnet-bot Mar 29, 2023
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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
is expected by the NET SDK used in the Workspace.MSBuild UnitTests. In order to test against the same verion of NuGet
as our configured SDK, we must set the version to be the same.
-->
<NuGetCommonVersion>6.4.0-rc.117</NuGetCommonVersion>
<NuGetCommonVersion>6.6.0-preview.3.57</NuGetCommonVersion>
<NuGetConfigurationVersion>$(NuGetCommonVersion)</NuGetConfigurationVersion>
<NuGetFrameworksVersion>$(NuGetCommonVersion)</NuGetFrameworksVersion>
<NuGetPackagingVersion>$(NuGetCommonVersion)</NuGetPackagingVersion>
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 @@ -7,9 +7,9 @@
"tools": {
"dotnet": "8.0.100-preview.1.23115.2",
"vs": {
"version": "17.4.1"
"version": "17.5.0"
},
"xcopy-msbuild": "17.4.1"
"xcopy-msbuild": "17.5.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23168.1",
Expand Down