Skip to content

Commit

Permalink
RuntimeFrameworkVersion enablement - final step (test projects) (#711)
Browse files Browse the repository at this point in the history 
With this change, System.Xaml tests actually build and run against System.Xaml!
  • Loading branch information
@vatsan-madhavan
vatsan-madhavan authored May 20, 2019
1 parent 031f4b7 commit d79e015
Show file tree
Hide file tree
Showing 17 changed files with 362 additions and 204 deletions.
113 changes: 110 additions & 3 deletions Microsoft.Dotnet.Wpf.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28407.52
VisualStudioVersion = 16.0.28815.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xaml", "src\Microsoft.DotNet.Wpf\src\System.Xaml\System.Xaml.csproj", "{9AC36357-34B7-40A1-95CA-FE9F46D089A7}"
EndProject
Expand All @@ -27,6 +27,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.WindowsDe
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Wpf.ProjectTemplates", "Microsoft.DotNet.Wpf.ProjectTemplates", "{22D643D8-87D6-4FE8-9632-58A3CD3DC7CB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml.Tests", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\DrtXaml\DrtXaml.Tests.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "src\Microsoft.DotNet.Wpf\test\Common\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\XamlTestClasses\XamlTestClasses.csproj", "{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses.FriendWithKey", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\XamlTestClasses.FriendWithKey\XamlTestClasses.FriendWithKey.csproj", "{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses.FriendWithoutKey", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\XamlTestClasses.FriendWithoutKey\XamlTestClasses.FriendWithoutKey.csproj", "{7D204145-BB36-4239-AD55-24DCE26BE997}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BamlTestClasses40", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\BamlTestClasses40\BamlTestClasses40.csproj", "{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BamlAvoidXmlTest", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\BamlAvoidXmlTest\BamlAvoidXmlTest.csproj", "{9163F98E-E941-45F5-9A57-47F375F50333}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -121,6 +137,90 @@ Global
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Release|x64.Build.0 = Release|x64
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Release|x86.ActiveCfg = Release|Any CPU
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Release|x86.Build.0 = Release|Any CPU
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|x64.ActiveCfg = Debug|x64
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|x64.Build.0 = Debug|x64
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|x86.ActiveCfg = Debug|Any CPU
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|x86.Build.0 = Debug|Any CPU
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|Any CPU.Build.0 = Release|Any CPU
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|x64.ActiveCfg = Release|x64
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|x64.Build.0 = Release|x64
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|x86.ActiveCfg = Release|Any CPU
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|x86.Build.0 = Release|Any CPU
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|Any CPU.Build.0 = Debug|Any CPU
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|x64.ActiveCfg = Debug|x64
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|x64.Build.0 = Debug|x64
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|x86.ActiveCfg = Debug|Any CPU
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|x86.Build.0 = Debug|Any CPU
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|Any CPU.ActiveCfg = Release|Any CPU
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|Any CPU.Build.0 = Release|Any CPU
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|x64.ActiveCfg = Release|x64
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|x64.Build.0 = Release|x64
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|x86.ActiveCfg = Release|Any CPU
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|x86.Build.0 = Release|Any CPU
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|x64.ActiveCfg = Debug|x64
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|x64.Build.0 = Debug|x64
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|x86.ActiveCfg = Debug|Any CPU
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|x86.Build.0 = Debug|Any CPU
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|Any CPU.Build.0 = Release|Any CPU
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|x64.ActiveCfg = Release|x64
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|x64.Build.0 = Release|x64
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|x86.ActiveCfg = Release|Any CPU
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|x86.Build.0 = Release|Any CPU
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|x64.ActiveCfg = Debug|x64
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|x64.Build.0 = Debug|x64
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|x86.ActiveCfg = Debug|Any CPU
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|x86.Build.0 = Debug|Any CPU
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|Any CPU.Build.0 = Release|Any CPU
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|x64.ActiveCfg = Release|x64
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|x64.Build.0 = Release|x64
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|x86.ActiveCfg = Release|Any CPU
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|x86.Build.0 = Release|Any CPU
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|x64.ActiveCfg = Debug|x64
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|x64.Build.0 = Debug|x64
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|x86.ActiveCfg = Debug|Any CPU
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|x86.Build.0 = Debug|Any CPU
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|Any CPU.Build.0 = Release|Any CPU
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|x64.ActiveCfg = Release|x64
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|x64.Build.0 = Release|x64
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|x86.ActiveCfg = Release|Any CPU
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|x86.Build.0 = Release|Any CPU
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|x64.ActiveCfg = Debug|x64
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|x64.Build.0 = Debug|x64
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|x86.ActiveCfg = Debug|Any CPU
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|x86.Build.0 = Debug|Any CPU
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|Any CPU.Build.0 = Release|Any CPU
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|x64.ActiveCfg = Release|x64
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|x64.Build.0 = Release|x64
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|x86.ActiveCfg = Release|Any CPU
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|x86.Build.0 = Release|Any CPU
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|x64.ActiveCfg = Debug|x64
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|x64.Build.0 = Debug|x64
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|x86.ActiveCfg = Debug|Any CPU
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|x86.Build.0 = Debug|Any CPU
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|Any CPU.Build.0 = Release|Any CPU
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|x64.ActiveCfg = Release|x64
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|x64.Build.0 = Release|x64
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|x86.ActiveCfg = Release|Any CPU
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -135,8 +235,15 @@ Global
{1D4C8AD7-12E7-4987-98AF-AEE79F53E494} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1} = {1D4C8AD7-12E7-4987-98AF-AEE79F53E494}
{22D643D8-87D6-4FE8-9632-58A3CD3DC7CB} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A} = {B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}
{387F3700-8C0B-4CEC-A68A-1725F656A249} = {B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486} = {B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5} = {B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}
{7D204145-BB36-4239-AD55-24DCE26BE997} = {B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2} = {B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}
{9163F98E-E941-45F5-9A57-47F375F50333} = {B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D4D12991-F531-4FC3-849D-29946BCA818A}
SolutionGuid = {B4340004-DAC0-497D-B69D-CFA7CD93F567}
EndGlobalSection
EndGlobal
121 changes: 0 additions & 121 deletions Tests.sln
View file

This file was deleted.

Loading

0 comments on commit d79e015

Please sign in to comment.