Skip to content

Merge main to main-vs-deps #61926

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
dotnet-bot merged 41 commits into from
Jun 15, 2022
Merged

Merge main to main-vs-deps #61926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
9602dab
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 5, 2022
793767c
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 7, 2022
afdf3aa
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 10, 2022
508e4cc
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 11, 2022
83deb7d
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 12, 2022
af50123
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 12, 2022
5cb2da4
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 12, 2022
3605f08
Generate VS SBOM during official builds.
JoeRobich May 13, 2022
4e1e0d9
Validate nuget feed
JoeRobich May 13, 2022
1c53817
Merge branch 'release/dev17.0-vs-deps' into darc-release/dev17.0-vs-d…
JoeRobich May 13, 2022
e4281f7
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 13, 2022
c6c808a
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 17, 2022
36f0601
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 21, 2022
3d37d01
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 24, 2022
ba3c08a
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 25, 2022
0718a44
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 26, 2022
940a54f
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 27, 2022
1ad87f3
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] May 31, 2022
4c969fe
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 1, 2022
e7c5cab
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 2, 2022
8f5d284
Do not build VS SBOM until Arcade supports it
JoeRobich Jun 6, 2022
48b976b
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jun 7, 2022
8fc71a4
Merge pull request #61144 from dotnet/darc-release/dev17.0-vs-deps-e0…
JoeRobich Jun 7, 2022
da07274
Merge pull request #61274 from dotnet/darc-release/dev16.11-vs-deps-e…
JoeRobich Jun 7, 2022
e1b1760
Merge branch 'release/dev17.0-vs-deps' into merges/release/dev16.11-v…
JoeRobich Jun 7, 2022
316bda1
Merge pull request #61757 from dotnet/merges/release/dev16.11-vs-deps…
JoeRobich Jun 7, 2022
dc80738
Merge pull request #61758 from dotnet/merges/release/dev17.0-vs-deps-…
JoeRobich Jun 13, 2022
ce72ba1
Merge pull request #61865 from dotnet/merges/release/dev17.0-vs-deps-…
JoeRobich Jun 14, 2022
bd35b1e
Fix MSBuildWorkspace tests
JoeRobich Jun 14, 2022
e635cb0
Merge pull request #61866 from dotnet/merges/release/dev17.1-to-relea…
dotnet-bot Jun 14, 2022
e39c684
Merge pull request #61901 from dotnet/merges/release/dev17.1-to-relea…
dotnet-bot Jun 14, 2022
6a961f8
Merge pull request #61902 from dotnet/merges/release/dev17.2-to-relea…
dotnet-bot Jun 15, 2022
6c191c8
Merge pull request #61907 from dotnet/merges/release/dev17.2-to-relea…
dotnet-bot Jun 15, 2022
3dcbf24
Add FixAll support of UseRecursivePattern refactoring
mavasani Jun 15, 2022
6bd4c78
Merge branch 'main' into merges/release/dev17.3-to-main
JoeRobich Jun 15, 2022
c04b935
Merge pull request #61908 from dotnet/merges/release/dev17.3-to-main
dotnet-bot Jun 15, 2022
76f7278
Add dev17.4 to publishing config
JoeRobich Jun 15, 2022
2987b30
Merge pull request #61920 from dotnet/dev/jorobich/update-publishing-…
JoeRobich Jun 15, 2022
04398cb
Let VS fix Compilers.sln (#61886)
jcouv Jun 15, 2022
c119061
Merge pull request #61915 from mavasani/FixAllUseRecursivePatterns
mavasani Jun 15, 2022
a77617a
Merge pull request #61923 from dotnet/merges/release/dev17.3-to-main
dotnet-bot Jun 15, 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
12 changes: 6 additions & 6 deletions Compilers.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,23 +169,23 @@ Global
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 5
src\Compilers\VisualBasic\CommandLine\VbcCommandLine.projitems*{48c93f90-8776-4847-96d8-127b896d6c80}*SharedItemsImports = 5
src\Compilers\CSharp\CommandLine\CscCommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 5
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{48c93f90-8776-4847-96d8-127b896d6c80}*SharedItemsImports = 5
src\Compilers\CSharp\csc\CscCommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 5
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{54e08bf5-f819-404f-a18d-0ab9ea81ea04}*SharedItemsImports = 13
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Compilers\Server\CommandLine\VBCSCompilerCommandLine.projitems*{869e3b79-4e91-45fd-ba37-56dbd2f34721}*SharedItemsImports = 5
src\Compilers\Server\CommandLine\VBCSCompilerCommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 5
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{869e3b79-4e91-45fd-ba37-56dbd2f34721}*SharedItemsImports = 5
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 5
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 5
src\Compilers\CSharp\CommandLine\CscCommandLine.projitems*{b5a27411-77ff-4c43-b0e3-fe09fba5f887}*SharedItemsImports = 5
src\Compilers\CSharp\csc\CscCommandLine.projitems*{b5a27411-77ff-4c43-b0e3-fe09fba5f887}*SharedItemsImports = 5
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13
src\Compilers\VisualBasic\CommandLine\VbcCommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 5
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 5
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{e8f0baa5-7327-43d1-9a51-644e81ae55f1}*SharedItemsImports = 13
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{e919dd77-34f8-4f57-8058-4d3ff4c2b241}*SharedItemsImports = 13
EndGlobalSection
Expand Down
10 changes: 10 additions & 0 deletions eng/config/PublishData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@
"vsMajorVersion": 17,
"insertionCreateDraftPR": true,
"insertionTitlePrefix": "[d17.3p3]"
},
"release/dev17.4-vs-deps": {
"nugetKind": [
"Shipping",
"NonShipping"
],
"vsBranch": "main",
"vsMajorVersion": 17,
"insertionCreateDraftPR": true,
"insertionTitlePrefix": "[d17.4p1]"
}
}
}
Loading