Skip to content

Commit 39048dd

Browse files
elinor-fungelinor-fung
authored
Undo solution and config changes from DllImportGenerator (#60481)
* Remove dotnet-experimental feed from NuGet.config * Revert changes to solution files and restore configs
1 parent cfe257f commit 39048dd

File tree

130 files changed

+510
-2689
lines changed

Some content is hidden

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

130 files changed

+510
-2689
lines changed

‎NuGet.config

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
2323
<!-- Used for the Rich Navigation indexing task -->
2424
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
25-
<!-- Used for DllImportGenerator -->
26-
<add key="dotnet-experimental" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json" />
2725
</packageSources>
2826
<disabledPackageSources>
2927
<clear />

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

-14
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ 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", "{0B795514-370A-4242-8810-DDD94E92877C}"
13-
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B0FE807A-573F-4DFB-94BE-AAB19AD31292}"
15-
EndProject
1612
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F81003B8-54C4-42B1-AD93-255B62E9DC55}"
1713
EndProject
1814
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A97E6A4A-8C69-4839-B3C5-3C7A716AC70A}"
@@ -45,14 +41,6 @@ Global
4541
{2141FEEA-0422-4319-B88D-DA15CBD77599}.Debug|Any CPU.Build.0 = Debug|Any CPU
4642
{2141FEEA-0422-4319-B88D-DA15CBD77599}.Release|Any CPU.ActiveCfg = Release|Any CPU
4743
{2141FEEA-0422-4319-B88D-DA15CBD77599}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{0B795514-370A-4242-8810-DDD94E92877C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{0B795514-370A-4242-8810-DDD94E92877C}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{0B795514-370A-4242-8810-DDD94E92877C}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{0B795514-370A-4242-8810-DDD94E92877C}.Release|Any CPU.Build.0 = Release|Any CPU
52-
{B0FE807A-573F-4DFB-94BE-AAB19AD31292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53-
{B0FE807A-573F-4DFB-94BE-AAB19AD31292}.Debug|Any CPU.Build.0 = Debug|Any CPU
54-
{B0FE807A-573F-4DFB-94BE-AAB19AD31292}.Release|Any CPU.ActiveCfg = Release|Any CPU
55-
{B0FE807A-573F-4DFB-94BE-AAB19AD31292}.Release|Any CPU.Build.0 = Release|Any CPU
5644
EndGlobalSection
5745
GlobalSection(SolutionProperties) = preSolution
5846
HideSolutionNode = FALSE
@@ -63,8 +51,6 @@ Global
6351
{10215DC2-1255-4B60-B0AC-D8B09BCEA179} = {F81003B8-54C4-42B1-AD93-255B62E9DC55}
6452
{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC} = {A97E6A4A-8C69-4839-B3C5-3C7A716AC70A}
6553
{2141FEEA-0422-4319-B88D-DA15CBD77599} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B}
66-
{0B795514-370A-4242-8810-DDD94E92877C} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B}
67-
{B0FE807A-573F-4DFB-94BE-AAB19AD31292} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B}
6854
EndGlobalSection
6955
GlobalSection(ExtensibilityGlobals) = postSolution
7056
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,10 +23,6 @@ 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", "{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636}"
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", "{3FCCE62E-3EE0-4629-B018-2B653DF43A62}"
29-
EndProject
3026
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}"
3127
EndProject
3228
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}"
@@ -103,14 +99,6 @@ Global
10399
{78971B06-2519-45B7-B761-C8A30C168EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
104100
{78971B06-2519-45B7-B761-C8A30C168EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
105101
{78971B06-2519-45B7-B761-C8A30C168EBE}.Release|Any CPU.Build.0 = Release|Any CPU
106-
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107-
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636}.Debug|Any CPU.Build.0 = Debug|Any CPU
108-
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636}.Release|Any CPU.ActiveCfg = Release|Any CPU
109-
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636}.Release|Any CPU.Build.0 = Release|Any CPU
110-
{3FCCE62E-3EE0-4629-B018-2B653DF43A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
111-
{3FCCE62E-3EE0-4629-B018-2B653DF43A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
112-
{3FCCE62E-3EE0-4629-B018-2B653DF43A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
113-
{3FCCE62E-3EE0-4629-B018-2B653DF43A62}.Release|Any CPU.Build.0 = Release|Any CPU
114102
{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115103
{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
116104
{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -164,8 +152,6 @@ Global
164152
{CD3D6F5B-0500-4035-A60A-592A2E231011} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
165153
{9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
166154
{78971B06-2519-45B7-B761-C8A30C168EBE} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
167-
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
168-
{3FCCE62E-3EE0-4629-B018-2B653DF43A62} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
169155
{C76753D0-F564-45E9-AA60-A846EFE0A414} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
170156
{5A9310B4-82AB-46F8-83C1-72D21A6A761F} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
171157
{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,10 +51,6 @@ 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", "{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B}"
55-
EndProject
56-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj", "{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288}"
57-
EndProject
5854
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{6EB2865B-C9F6-4F9B-82DA-4C577587B577}"
5955
EndProject
6056
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{A49023C8-173A-4B8F-84B3-2FF37FE8344A}"
@@ -175,14 +171,6 @@ Global
175171
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
176172
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
177173
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Release|Any CPU.Build.0 = Release|Any CPU
178-
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
179-
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B}.Debug|Any CPU.Build.0 = Debug|Any CPU
180-
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B}.Release|Any CPU.ActiveCfg = Release|Any CPU
181-
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B}.Release|Any CPU.Build.0 = Release|Any CPU
182-
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183-
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288}.Debug|Any CPU.Build.0 = Debug|Any CPU
184-
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288}.Release|Any CPU.ActiveCfg = Release|Any CPU
185-
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288}.Release|Any CPU.Build.0 = Release|Any CPU
186174
{6EB2865B-C9F6-4F9B-82DA-4C577587B577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
187175
{6EB2865B-C9F6-4F9B-82DA-4C577587B577}.Debug|Any CPU.Build.0 = Debug|Any CPU
188176
{6EB2865B-C9F6-4F9B-82DA-4C577587B577}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -223,8 +211,6 @@ Global
223211
{B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
224212
{7517D0A0-5596-48B7-96EF-CB24DAD72675} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
225213
{BD19B1E7-CAFF-4009-874A-760D5A466E28} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
226-
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
227-
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
228214
{A49023C8-173A-4B8F-84B3-2FF37FE8344A} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
229215
EndGlobalSection
230216
GlobalSection(ExtensibilityGlobals) = postSolution

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

-14
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ 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", "{D541ED18-720A-47E8-82F8-7B994EB408A3}"
55-
EndProject
56-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.Roslyn4.0.csproj", "{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859}"
57-
EndProject
5854
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{705F880D-3E27-4ACA-87CC-808BB7DDA610}"
5955
EndProject
6056
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}"
@@ -175,14 +171,6 @@ Global
175171
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Debug|Any CPU.Build.0 = Debug|Any CPU
176172
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
177173
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.Build.0 = Release|Any CPU
178-
{D541ED18-720A-47E8-82F8-7B994EB408A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
179-
{D541ED18-720A-47E8-82F8-7B994EB408A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
180-
{D541ED18-720A-47E8-82F8-7B994EB408A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
181-
{D541ED18-720A-47E8-82F8-7B994EB408A3}.Release|Any CPU.Build.0 = Release|Any CPU
182-
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183-
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859}.Debug|Any CPU.Build.0 = Debug|Any CPU
184-
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859}.Release|Any CPU.ActiveCfg = Release|Any CPU
185-
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859}.Release|Any CPU.Build.0 = Release|Any CPU
186174
{705F880D-3E27-4ACA-87CC-808BB7DDA610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
187175
{705F880D-3E27-4ACA-87CC-808BB7DDA610}.Debug|Any CPU.Build.0 = Debug|Any CPU
188176
{705F880D-3E27-4ACA-87CC-808BB7DDA610}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -223,8 +211,6 @@ Global
223211
{BD85452C-1434-40FF-8A2C-36BF135A22FE} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
224212
{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
225213
{1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
226-
{D541ED18-720A-47E8-82F8-7B994EB408A3} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
227-
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
228214
{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
229215
EndGlobalSection
230216
GlobalSection(ExtensibilityGlobals) = postSolution

0 commit comments

Comments
 (0)