Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 544e9e8

Browse files
committed
Merge pull request #2478 from stephentoub/fix_projecttypeguids
Remove extraneous ProjectTypeGuids causing load failures
2 parents ed0f12d + 6896000 commit 544e9e8

11 files changed

+0
-19
lines changed

src/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watche
66
EndProject
77
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watcher.Tests", "tests\System.IO.FileSystem.Watcher.Tests.csproj", "{20411A66-C7A4-4941-8FA2-66308365FD22}"
88
EndProject
9-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{4B06330D-B839-4D9B-AC32-D510B7AB9FB9}"
10-
EndProject
11-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{613515D7-B799-4EB8-B262-C54A2279C77B}"
12-
EndProject
139
Global
1410
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1511
Linux_Debug|Any CPU = Linux_Debug|Any CPU
@@ -44,9 +40,4 @@ Global
4440
GlobalSection(SolutionProperties) = preSolution
4541
HideSolutionNode = FALSE
4642
EndGlobalSection
47-
GlobalSection(NestedProjects) = preSolution
48-
{20411A66-C7A4-4941-8FA2-66308365FD22} = {4B06330D-B839-4D9B-AC32-D510B7AB9FB9}
49-
{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A} = {613515D7-B799-4EB8-B262-C54A2279C77B}
50-
{613515D7-B799-4EB8-B262-C54A2279C77B} = {4B06330D-B839-4D9B-AC32-D510B7AB9FB9}
51-
EndGlobalSection
5243
EndGlobal

src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{20411A66-C7A4-4941-8FA2-66308365FD22}</ProjectGuid>
8-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
98
<OutputType>Library</OutputType>
109
<AssemblyName>System.IO.FileSystem.Watcher.Tests</AssemblyName>
1110
</PropertyGroup>

src/System.Xml.XDocument/tests/Properties/System.Xml.XDocument.Properties.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}</ProjectGuid>
8-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
98
<OutputType>Library</OutputType>
109
<AssemblyName>System.Xml.XDocument.Properties.Tests</AssemblyName>
1110
<RootNamespace>CoreXml.Test.XLinq</RootNamespace>

src/System.Xml.XDocument/tests/SDMSample/System.Xml.XDocument.SDMSample.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{F6C73170-9333-4B52-B3FA-A536C5EA6A48}</ProjectGuid>
8-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
98
<OutputType>Library</OutputType>
109
<AssemblyName>System.Xml.XDocument.SDMSample.Tests</AssemblyName>
1110
<RootNamespace>CoreXml.Test.XLinq</RootNamespace>

src/System.Xml.XDocument/tests/Streaming/System.Xml.XDocument.Streaming.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{CB11B315-2567-4574-977D-89E3135243C4}</ProjectGuid>
8-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
98
<OutputType>Library</OutputType>
109
<AssemblyName>System.Xml.XDocument.Streaming.Tests</AssemblyName>
1110
<RootNamespace>CoreXml.Test.XLinq</RootNamespace>

src/System.Xml.XDocument/tests/TreeManipulation/System.Xml.XDocument.TreeManipulation.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{10EFE488-FAB4-43DA-847D-FF057BFF52AC}</ProjectGuid>
8-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
98
<OutputType>Library</OutputType>
109
<AssemblyName>System.Xml.XDocument.TreeManipulation.Tests</AssemblyName>
1110
<RootNamespace>XLinqTests</RootNamespace>

src/System.Xml.XDocument/tests/XDocument.Common/XDocument.Common.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{52666206-B6C9-49FA-A1D7-D0A0C68807B0}</ProjectGuid>
8-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
98
<OutputType>Library</OutputType>
109
<AssemblyName>cXDocument.Common</AssemblyName>
1110
<RootNamespace>CoreXml.Test.XLinq</RootNamespace>

src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{979510CE-9042-4F8D-9C74-EE03B89194CC}</ProjectGuid>
8-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
98
<OutputType>Library</OutputType>
109
<AssemblyName>XDocument.Test.ModuleCore</AssemblyName>
1110
<RootNamespace>Microsoft.Test.ModuleCore</RootNamespace>

src/System.Xml.XDocument/tests/misc/System.Xml.XDocument.Misc.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}</ProjectGuid>
8-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
98
<OutputType>Library</OutputType>
109
<AssemblyName>System.Xml.XDocument.Misc.Tests</AssemblyName>
1110
<RootNamespace>CoreXml.Test.XLinq</RootNamespace>

src/System.Xml.XDocument/tests/xNodeBuilder/System.Xml.XDocument.xNodeBuilder.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}</ProjectGuid>
8-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
98
<OutputType>Library</OutputType>
109
<AssemblyName>System.Xml.XDocument.xNodeBuilder.Tests</AssemblyName>
1110
<RootNamespace>CoreXml.Test.XLinq</RootNamespace>

0 commit comments

Comments
 (0)