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

Update changed solution files under src/libraries #57483

Merged
merged 6 commits into from
Aug 18, 2021
Merged

Update changed solution files under src/libraries #57483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4169f0
Update slngen logic and remove unnecessary P2Ps
ViktorHofer Aug 16, 2021
c801fcc
Update changed soluion files under src/libraries
ViktorHofer Aug 16, 2021
8dda133
Fix Platforms build
ViktorHofer Aug 16, 2021
268e9ce
Update comment in slngen.targets
ViktorHofer Aug 18, 2021
3a059a6
Update slngen.targets
ViktorHofer Aug 18, 2021
a13adce
Merge branch 'main' into Updateslns
ViktorHofer Aug 18, 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: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]
},
"microsoft.visualstudio.slngen.tool": {
"version": "6.0.1",
"version": "6.1.0",
"commands": [
"slngen"
]
Expand Down
9 changes: 4 additions & 5 deletions eng/slngen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
<SlnGenSolutionFolder Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">tests</SlnGenSolutionFolder>
<SlnGenSolutionFolder Condition="'$(SlnGenSolutionFolder)' == ''">src</SlnGenSolutionFolder>

<!-- Don't include shared framework projects referenced via a named reference except the leaf's project. -->
<IncludeInSolutionFile Condition="'$(IsNETCoreAppRef)' == 'true' and '$(MSBuildProjectName)' != '$(SlnGenMainProject)'">false</IncludeInSolutionFile>

<!-- Include CompilerServices.Unsafe as it's a transitive test dependency. -->
<IncludeInSolutionFile Condition="'$(IsNETCoreAppRef)' == 'true' and '$(MSBuildProjectName)' == 'System.Runtime.CompilerServices.Unsafe'">true</IncludeInSolutionFile>
<!-- Don't include reference projects which compose the microsoft.netcore.app targeting pack (except the current leaf's reference project) as those are referenced by the source project via named references
and hence don't need to be part of the solution file (only P2Ps need to).
Include the reference project in the solution file if it targets more than just NetCoreAppCurrent as other frameworks like .NETFramework, .NETStandard or older .NETCoreApp ones require it. -->
<IncludeInSolutionFile Condition="'$(IsNETCoreAppRef)' == 'true' and '$(MSBuildProjectName)' != '$(SlnGenMainProject)' and '$(TargetFrameworks)' == '$(NetCoreAppCurrent)'">false</IncludeInSolutionFile>
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>
<ItemGroup>
<SlnGenCustomProjectTypeGuid Include=".ilproj" ProjectTypeGuid="{9A19103F-16F7-4668-BE54-9A1E7A4F7556}" />
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
<!-- Upgrade the NetStandard.Library transitive xunit dependency to avoid 1.x NS dependencies. -->
<PackageReference Include="NETStandard.Library" Version="$(NetStandardLibraryVersion)" />
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj" PrivateAssets="all" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
Expand Down
112 changes: 63 additions & 49 deletions ...aries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 69 additions & 55 deletions ...t.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
View file
Open in desktop

Large diffs are not rendered by default.

150 changes: 75 additions & 75 deletions ...braries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln
View file
Open in desktop

Large diffs are not rendered by default.

214 changes: 114 additions & 100 deletions src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 27 additions & 13 deletions src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@ 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", "{4A28B457-D950-486B-B59B-A4C977A733B1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{50F89560-1449-44E4-844E-72815256534B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{7902A0CA-E94D-4C96-A112-455A1E5E2390}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{8E212A9D-391B-4EFA-943D-7D104A9D3D7E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{FA7201FE-097D-4197-BDEC-329986814D8D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{50BA55F5-BD05-4C05-910F-2BFD20BD3465}"
Expand All @@ -47,6 +51,10 @@ Global
{5C580568-6072-4F27-B5C6-FA04556E3B98}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C580568-6072-4F27-B5C6-FA04556E3B98}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C580568-6072-4F27-B5C6-FA04556E3B98}.Release|Any CPU.Build.0 = Release|Any CPU
{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Release|Any CPU.Build.0 = Release|Any CPU
{5351C410-530D-4724-A8E6-430831E7332B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5351C410-530D-4724-A8E6-430831E7332B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5351C410-530D-4724-A8E6-430831E7332B}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -55,26 +63,30 @@ Global
{E5B6A94F-615E-4DAF-8110-E5A776BB8296}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5B6A94F-615E-4DAF-8110-E5A776BB8296}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5B6A94F-615E-4DAF-8110-E5A776BB8296}.Release|Any CPU.Build.0 = Release|Any CPU
{FA7201FE-097D-4197-BDEC-329986814D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FA7201FE-097D-4197-BDEC-329986814D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA7201FE-097D-4197-BDEC-329986814D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FA7201FE-097D-4197-BDEC-329986814D8D}.Release|Any CPU.Build.0 = Release|Any CPU
{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Release|Any CPU.Build.0 = Release|Any CPU
{4A28B457-D950-486B-B59B-A4C977A733B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A28B457-D950-486B-B59B-A4C977A733B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A28B457-D950-486B-B59B-A4C977A733B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A28B457-D950-486B-B59B-A4C977A733B1}.Release|Any CPU.Build.0 = Release|Any CPU
{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Release|Any CPU.Build.0 = Release|Any CPU
{FA7201FE-097D-4197-BDEC-329986814D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FA7201FE-097D-4197-BDEC-329986814D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA7201FE-097D-4197-BDEC-329986814D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FA7201FE-097D-4197-BDEC-329986814D8D}.Release|Any CPU.Build.0 = Release|Any CPU
{F38E2965-8DBB-4795-89AF-C0109EB23574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F38E2965-8DBB-4795-89AF-C0109EB23574}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F38E2965-8DBB-4795-89AF-C0109EB23574}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F38E2965-8DBB-4795-89AF-C0109EB23574}.Release|Any CPU.Build.0 = Release|Any CPU
{50F89560-1449-44E4-844E-72815256534B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50F89560-1449-44E4-844E-72815256534B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50F89560-1449-44E4-844E-72815256534B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50F89560-1449-44E4-844E-72815256534B}.Release|Any CPU.Build.0 = Release|Any CPU
{8E212A9D-391B-4EFA-943D-7D104A9D3D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E212A9D-391B-4EFA-943D-7D104A9D3D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E212A9D-391B-4EFA-943D-7D104A9D3D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E212A9D-391B-4EFA-943D-7D104A9D3D7E}.Release|Any CPU.Build.0 = Release|Any CPU
{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Release|Any CPU.Build.0 = Release|Any CPU
{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -90,14 +102,16 @@ Global
GlobalSection(NestedProjects) = preSolution
{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465}
{F38E2965-8DBB-4795-89AF-C0109EB23574} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465}
{50F89560-1449-44E4-844E-72815256534B} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465}
{8E212A9D-391B-4EFA-943D-7D104A9D3D7E} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465}
{696D69C9-C5F6-405E-A8B5-5375D08BBADC} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465}
{F5E89C81-2D78-4F86-ABD2-7D983F46EB58} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8}
{5351C410-530D-4724-A8E6-430831E7332B} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8}
{E5B6A94F-615E-4DAF-8110-E5A776BB8296} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8}
{5C580568-6072-4F27-B5C6-FA04556E3B98} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
{FA7201FE-097D-4197-BDEC-329986814D8D} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
{7902A0CA-E94D-4C96-A112-455A1E5E2390} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
{4A28B457-D950-486B-B59B-A4C977A733B1} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
{FA7201FE-097D-4197-BDEC-329986814D8D} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
{2AED2951-7724-4EFC-8E16-6DF877C6B4A6} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
EndGlobalSection
Expand Down
Loading