Skip to content
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

Jump to bottom

Undo solution and config changes from DllImportGenerator #60481

Merged
merged 2 commits into from
Oct 15, 2021
Merged

Undo solution and config changes from DllImportGenerator #60481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24fc3c0
Remove dotnet-experimental feed from NuGet.config
elinor-fung Oct 15, 2021
2aed89d
Revert changes to solution files and restore configs
elinor-fung Oct 15, 2021
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: 0 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
<!-- Used for the Rich Navigation indexing task -->
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
<!-- Used for DllImportGenerator -->
<add key="dotnet-experimental" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
14 changes: 0 additions & 14 deletions src/libraries/Common/Common.Tests.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
EndProject
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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.DllImportGenerator", "..\System.Runtime.InteropServices\gen\DllImportGenerator\DllImportGenerator.csproj", "{0B795514-370A-4242-8810-DDD94E92877C}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F81003B8-54C4-42B1-AD93-255B62E9DC55}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A97E6A4A-8C69-4839-B3C5-3C7A716AC70A}"
Expand Down Expand Up @@ -45,14 +41,6 @@ Global
{2141FEEA-0422-4319-B88D-DA15CBD77599}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2141FEEA-0422-4319-B88D-DA15CBD77599}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2141FEEA-0422-4319-B88D-DA15CBD77599}.Release|Any CPU.Build.0 = Release|Any CPU
{0B795514-370A-4242-8810-DDD94E92877C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B795514-370A-4242-8810-DDD94E92877C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B795514-370A-4242-8810-DDD94E92877C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B795514-370A-4242-8810-DDD94E92877C}.Release|Any CPU.Build.0 = Release|Any CPU
{B0FE807A-573F-4DFB-94BE-AAB19AD31292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B0FE807A-573F-4DFB-94BE-AAB19AD31292}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B0FE807A-573F-4DFB-94BE-AAB19AD31292}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B0FE807A-573F-4DFB-94BE-AAB19AD31292}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -63,8 +51,6 @@ Global
{10215DC2-1255-4B60-B0AC-D8B09BCEA179} = {F81003B8-54C4-42B1-AD93-255B62E9DC55}
{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC} = {A97E6A4A-8C69-4839-B3C5-3C7A716AC70A}
{2141FEEA-0422-4319-B88D-DA15CBD77599} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B}
{0B795514-370A-4242-8810-DDD94E92877C} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B}
{B0FE807A-573F-4DFB-94BE-AAB19AD31292} = {056FFC76-3DAC-4C6C-8E96-303B403EB50B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4543E82B-8616-438A-B58B-EE47079D6956}
Expand Down
14 changes: 0 additions & 14 deletions src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{78971B06-2519-45B7-B761-C8A30C168EBE}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
Expand Down Expand Up @@ -103,14 +99,6 @@ Global
{78971B06-2519-45B7-B761-C8A30C168EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{78971B06-2519-45B7-B761-C8A30C168EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{78971B06-2519-45B7-B761-C8A30C168EBE}.Release|Any CPU.Build.0 = Release|Any CPU
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636}.Release|Any CPU.Build.0 = Release|Any CPU
{3FCCE62E-3EE0-4629-B018-2B653DF43A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3FCCE62E-3EE0-4629-B018-2B653DF43A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3FCCE62E-3EE0-4629-B018-2B653DF43A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3FCCE62E-3EE0-4629-B018-2B653DF43A62}.Release|Any CPU.Build.0 = Release|Any CPU
{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -164,8 +152,6 @@ Global
{CD3D6F5B-0500-4035-A60A-592A2E231011} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{78971B06-2519-45B7-B761-C8A30C168EBE} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{EC8B7B0A-992B-4F9B-8E40-9C4B80CD1636} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{3FCCE62E-3EE0-4629-B018-2B653DF43A62} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{C76753D0-F564-45E9-AA60-A846EFE0A414} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{5A9310B4-82AB-46F8-83C1-72D21A6A761F} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B} = {67719AA1-52DC-4E35-B6F7-2F53A50B913A}
Expand Down
14 changes: 0 additions & 14 deletions ...aries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web",
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{6EB2865B-C9F6-4F9B-82DA-4C577587B577}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{A49023C8-173A-4B8F-84B3-2FF37FE8344A}"
Expand Down Expand Up @@ -175,14 +171,6 @@ Global
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Release|Any CPU.Build.0 = Release|Any CPU
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B}.Release|Any CPU.Build.0 = Release|Any CPU
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288}.Release|Any CPU.Build.0 = Release|Any CPU
{6EB2865B-C9F6-4F9B-82DA-4C577587B577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6EB2865B-C9F6-4F9B-82DA-4C577587B577}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6EB2865B-C9F6-4F9B-82DA-4C577587B577}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -223,8 +211,6 @@ Global
{B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{7517D0A0-5596-48B7-96EF-CB24DAD72675} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{BD19B1E7-CAFF-4009-874A-760D5A466E28} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{AC48C19A-FCF1-4E4C-BBC1-8E499576D71B} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{B3C83FA0-5A0D-4BD4-A3C8-4340DEBAB288} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
{A49023C8-173A-4B8F-84B3-2FF37FE8344A} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
14 changes: 0 additions & 14 deletions ...t.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web",
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{705F880D-3E27-4ACA-87CC-808BB7DDA610}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}"
Expand Down Expand Up @@ -175,14 +171,6 @@ Global
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.Build.0 = Release|Any CPU
{D541ED18-720A-47E8-82F8-7B994EB408A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D541ED18-720A-47E8-82F8-7B994EB408A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D541ED18-720A-47E8-82F8-7B994EB408A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D541ED18-720A-47E8-82F8-7B994EB408A3}.Release|Any CPU.Build.0 = Release|Any CPU
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859}.Release|Any CPU.Build.0 = Release|Any CPU
{705F880D-3E27-4ACA-87CC-808BB7DDA610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{705F880D-3E27-4ACA-87CC-808BB7DDA610}.Debug|Any CPU.Build.0 = Debug|Any CPU
{705F880D-3E27-4ACA-87CC-808BB7DDA610}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -223,8 +211,6 @@ Global
{BD85452C-1434-40FF-8A2C-36BF135A22FE} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{D541ED18-720A-47E8-82F8-7B994EB408A3} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{BC5FDB4B-C4B3-45F4-BAD0-43571AE96859} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
Loading