Skip to content

Commit 0964be0

Browse files
ViktorHoferViktorHofer
authored
Update slngen and solution files (dotnet#60871)
Update slngen tooling to latest stable version and solution files since a lot changed since the last time they were updated: - NET7 (removal of older TFMs) - Source Generators
1 parent 1888959 commit 0964be0

File tree

140 files changed

+3787
-583
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+3787
-583
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"microsoft.visualstudio.slngen.tool": {
24-
"version": "6.1.10",
24+
"version": "6.3.0",
2525
"commands": [
2626
"slngen"
2727
]

‎src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
TODO https://github.com/dotnet/roslyn/pull/51964: EventSource generator is currently disabled for design time builds as it is
306306
causing impactful slowdowns while typing in the Corelib project.
307307
-->
308-
<ItemGroup Condition="'$(DesignTimeBuild)'!='true'">
308+
<ItemGroup Condition="'$(DesignTimeBuild)'!='true' or '$(SlnGenMainProject)' != ''">
309309
<ProjectReference Include="$(LibrariesProjectRoot)\System.Private.CoreLib\generators\System.Private.CoreLib.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
310310
</ItemGroup>
311311

‎src/libraries/Common/Common.Tests.sln

+14
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2141FEEA-0422-4319-B88D-DA15CBD77599}"
1111
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}"
13+
EndProject
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07}"
15+
EndProject
1216
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F81003B8-54C4-42B1-AD93-255B62E9DC55}"
1317
EndProject
1418
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A97E6A4A-8C69-4839-B3C5-3C7A716AC70A}"
@@ -41,6 +45,14 @@ Global
4145
{2141FEEA-0422-4319-B88D-DA15CBD77599}.Debug|Any CPU.Build.0 = Debug|Any CPU
4246
{2141FEEA-0422-4319-B88D-DA15CBD77599}.Release|Any CPU.ActiveCfg = Release|Any CPU
4347
{2141FEEA-0422-4319-B88D-DA15CBD77599}.Release|Any CPU.Build.0 = Release|Any CPU
48+
{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49+
{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}.Debug|Any CPU.Build.0 = Debug|Any CPU
50+
{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{026037B4-2AC1-41C0-BB7C-1F8BAF64335D}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07}.Release|Any CPU.Build.0 = Release|Any CPU
4456
EndGlobalSection
4557
GlobalSection(SolutionProperties) = preSolution
4658
HideSolutionNode = FALSE
@@ -51,6 +63,8 @@ Global
5163
{10215DC2-1255-4B60-B0AC-D8B09BCEA179} = {F81003B8-54C4-42B1-AD93-255B62E9DC55}
5264
{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC} = {A97E6A4A-8C69-4839-B3C5-3C7A716AC70A}
5365
{2141FEEA-0422-4319-B88D-DA15CBD77599} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B}
66+
{026037B4-2AC1-41C0-BB7C-1F8BAF64335D} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B}
67+
{9AAD008E-8B3B-45DB-AD31-DE41C6A1FE07} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B}
5468
EndGlobalSection
5569
GlobalSection(ExtensibilityGlobals) = postSolution
5670
SolutionGuid = {4543E82B-8616-438A-B58B-EE47079D6956}

‎src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln

+14
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
2323
EndProject
2424
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{78971B06-2519-45B7-B761-C8A30C168EBE}"
2525
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.Roslyn3.11.csproj", "{A7F69E1A-D6DF-46A9-A347-66354425BC9E}"
27+
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Generators", "..\Microsoft.Extensions.Logging.Abstractions\gen\Microsoft.Extensions.Logging.Generators.Roslyn4.0.csproj", "{11D672F4-D640-423D-A79A-2A5EA498D3BF}"
29+
EndProject
2630
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}"
2731
EndProject
2832
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{C76753D0-F564-45E9-AA60-A846EFE0A414}"
@@ -99,6 +103,14 @@ Global
99103
{78971B06-2519-45B7-B761-C8A30C168EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
100104
{78971B06-2519-45B7-B761-C8A30C168EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
101105
{78971B06-2519-45B7-B761-C8A30C168EBE}.Release|Any CPU.Build.0 = Release|Any CPU
106+
{A7F69E1A-D6DF-46A9-A347-66354425BC9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107+
{A7F69E1A-D6DF-46A9-A347-66354425BC9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
108+
{A7F69E1A-D6DF-46A9-A347-66354425BC9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
109+
{A7F69E1A-D6DF-46A9-A347-66354425BC9E}.Release|Any CPU.Build.0 = Release|Any CPU
110+
{11D672F4-D640-423D-A79A-2A5EA498D3BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
111+
{11D672F4-D640-423D-A79A-2A5EA498D3BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
112+
{11D672F4-D640-423D-A79A-2A5EA498D3BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
113+
{11D672F4-D640-423D-A79A-2A5EA498D3BF}.Release|Any CPU.Build.0 = Release|Any CPU
102114
{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103115
{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
104116
{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -152,6 +164,8 @@ Global
152164
{CD3D6F5B-0500-4035-A60A-592A2E231011} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
153165
{9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
154166
{78971B06-2519-45B7-B761-C8A30C168EBE} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
167+
{A7F69E1A-D6DF-46A9-A347-66354425BC9E} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
168+
{11D672F4-D640-423D-A79A-2A5EA498D3BF} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
155169
{C76753D0-F564-45E9-AA60-A846EFE0A414} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
156170
{5A9310B4-82AB-46F8-83C1-72D21A6A761F} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
157171
{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}

‎src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln

+14
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web",
5151
EndProject
5252
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{BD19B1E7-CAFF-4009-874A-760D5A466E28}"
5353
EndProject
54+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn3.11.csproj", "{CC3E9E0A-4417-4678-87CC-1D2B001C3232}"
55+
EndProject
56+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj", "{701D92CA-90E0-4611-B1DF-F2D31503563F}"
57+
EndProject
5458
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{6EB2865B-C9F6-4F9B-82DA-4C577587B577}"
5559
EndProject
5660
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{A49023C8-173A-4B8F-84B3-2FF37FE8344A}"
@@ -171,6 +175,14 @@ Global
171175
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
172176
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
173177
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Release|Any CPU.Build.0 = Release|Any CPU
178+
{CC3E9E0A-4417-4678-87CC-1D2B001C3232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
179+
{CC3E9E0A-4417-4678-87CC-1D2B001C3232}.Debug|Any CPU.Build.0 = Debug|Any CPU
180+
{CC3E9E0A-4417-4678-87CC-1D2B001C3232}.Release|Any CPU.ActiveCfg = Release|Any CPU
181+
{CC3E9E0A-4417-4678-87CC-1D2B001C3232}.Release|Any CPU.Build.0 = Release|Any CPU
182+
{701D92CA-90E0-4611-B1DF-F2D31503563F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183+
{701D92CA-90E0-4611-B1DF-F2D31503563F}.Debug|Any CPU.Build.0 = Debug|Any CPU
184+
{701D92CA-90E0-4611-B1DF-F2D31503563F}.Release|Any CPU.ActiveCfg = Release|Any CPU
185+
{701D92CA-90E0-4611-B1DF-F2D31503563F}.Release|Any CPU.Build.0 = Release|Any CPU
174186
{6EB2865B-C9F6-4F9B-82DA-4C577587B577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
175187
{6EB2865B-C9F6-4F9B-82DA-4C577587B577}.Debug|Any CPU.Build.0 = Debug|Any CPU
176188
{6EB2865B-C9F6-4F9B-82DA-4C577587B577}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -211,6 +223,8 @@ Global
211223
{B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
212224
{7517D0A0-5596-48B7-96EF-CB24DAD72675} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
213225
{BD19B1E7-CAFF-4009-874A-760D5A466E28} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
226+
{CC3E9E0A-4417-4678-87CC-1D2B001C3232} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
227+
{701D92CA-90E0-4611-B1DF-F2D31503563F} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
214228
{A49023C8-173A-4B8F-84B3-2FF37FE8344A} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
215229
EndGlobalSection
216230
GlobalSection(ExtensibilityGlobals) = postSolution

‎src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln

+14
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web",
5151
EndProject
5252
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{1555B38A-E9CB-4734-AAB1-59CFB833A06D}"
5353
EndProject
54+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn3.11.csproj", "{C5BA84F6-C75B-4698-9733-38C67C285215}"
55+
EndProject
56+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj", "{D52BA380-089D-46CD-98E5-F471B9D7CCA4}"
57+
EndProject
5458
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{705F880D-3E27-4ACA-87CC-808BB7DDA610}"
5559
EndProject
5660
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}"
@@ -171,6 +175,14 @@ Global
171175
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Debug|Any CPU.Build.0 = Debug|Any CPU
172176
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
173177
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.Build.0 = Release|Any CPU
178+
{C5BA84F6-C75B-4698-9733-38C67C285215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
179+
{C5BA84F6-C75B-4698-9733-38C67C285215}.Debug|Any CPU.Build.0 = Debug|Any CPU
180+
{C5BA84F6-C75B-4698-9733-38C67C285215}.Release|Any CPU.ActiveCfg = Release|Any CPU
181+
{C5BA84F6-C75B-4698-9733-38C67C285215}.Release|Any CPU.Build.0 = Release|Any CPU
182+
{D52BA380-089D-46CD-98E5-F471B9D7CCA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183+
{D52BA380-089D-46CD-98E5-F471B9D7CCA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
184+
{D52BA380-089D-46CD-98E5-F471B9D7CCA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
185+
{D52BA380-089D-46CD-98E5-F471B9D7CCA4}.Release|Any CPU.Build.0 = Release|Any CPU
174186
{705F880D-3E27-4ACA-87CC-808BB7DDA610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
175187
{705F880D-3E27-4ACA-87CC-808BB7DDA610}.Debug|Any CPU.Build.0 = Debug|Any CPU
176188
{705F880D-3E27-4ACA-87CC-808BB7DDA610}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -211,6 +223,8 @@ Global
211223
{BD85452C-1434-40FF-8A2C-36BF135A22FE} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
212224
{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
213225
{1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
226+
{C5BA84F6-C75B-4698-9733-38C67C285215} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
227+
{D52BA380-089D-46CD-98E5-F471B9D7CCA4} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
214228
{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
215229
EndGlobalSection
216230
GlobalSection(ExtensibilityGlobals) = postSolution

0 commit comments

Comments
 (0)