Skip to content
This repository has been archived by the owner on Dec 18, 2017. It is now read-only.

Commit

Permalink
Remove test dependency on Windows Phone tools
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChengTian
ChengTian committed Jul 24, 2015
1 parent a7bea6b commit 48059e4
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 175 deletions.
16 changes: 1 addition & 15 deletions misc/DnuWrapTestSolutions/ConsoleApp1/ConsoleApp1.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 14
VisualStudioVersion = 14.0.22303.1
VisualStudioVersion = 14.0.23101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7DABD5AE-2ABC-4D08-BA24-7118D5073F77}"
EndProject
Expand All @@ -22,8 +22,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibraryBeta.PCL", "LibraryB
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibraryBeta.PCL.Desktop", "LibraryBeta.PCL.Desktop\LibraryBeta.PCL.Desktop.csproj", "{01ADBDEA-3B6E-44DD-94A0-83349000C4DD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibraryBeta.PCL.Phone", "LibraryBeta.PCL.Phone\LibraryBeta.PCL.Phone.csproj", "{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LibraryBeta", "src\LibraryBeta\LibraryBeta.xproj", "{6BF9B47F-E3E5-4C1A-9F48-9690C7298ED6}"
EndProject
Global
Expand Down Expand Up @@ -108,18 +106,6 @@ Global
{01ADBDEA-3B6E-44DD-94A0-83349000C4DD}.Release|ARM.Build.0 = Release|Any CPU
{01ADBDEA-3B6E-44DD-94A0-83349000C4DD}.Release|x86.ActiveCfg = Release|Any CPU
{01ADBDEA-3B6E-44DD-94A0-83349000C4DD}.Release|x86.Build.0 = Release|Any CPU
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Debug|ARM.ActiveCfg = Debug|ARM
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Debug|ARM.Build.0 = Debug|ARM
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Debug|x86.ActiveCfg = Debug|x86
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Debug|x86.Build.0 = Debug|x86
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Release|Any CPU.Build.0 = Release|Any CPU
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Release|ARM.ActiveCfg = Release|ARM
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Release|ARM.Build.0 = Release|ARM
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Release|x86.ActiveCfg = Release|x86
{9E80E9DB-D1BE-4C01-AEF9-D5DFC6547423}.Release|x86.Build.0 = Release|x86
{6BF9B47F-E3E5-4C1A-9F48-9690C7298ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BF9B47F-E3E5-4C1A-9F48-9690C7298ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BF9B47F-E3E5-4C1A-9F48-9690C7298ED6}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down
12 changes: 0 additions & 12 deletions misc/DnuWrapTestSolutions/ConsoleApp1/LibraryBeta.PCL.Phone/Class1.cs
View file

This file was deleted.

102 changes: 0 additions & 102 deletions misc/DnuWrapTestSolutions/ConsoleApp1/LibraryBeta.PCL.Phone/LibraryBeta.PCL.Phone.csproj
View file

This file was deleted.

29 changes: 0 additions & 29 deletions misc/DnuWrapTestSolutions/ConsoleApp1/LibraryBeta.PCL.Phone/Properties/AssemblyInfo.cs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion misc/DnuWrapTestSolutions/ConsoleApp1/LibraryBeta.PCL/LibraryBeta.PCL.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<DefaultLanguage>en-US</DefaultLanguage>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down
17 changes: 1 addition & 16 deletions test/Microsoft.Framework.PackageManager.FunctionalTests/DnuWrapTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void DnuWrapUpdatesExistingProjectJson(string flavor, string os, string a
""version"": ""1.0.0-*"",
""dependencies"": {},
""frameworks"": {
""net45+win+wpa81+wp80"": {
""net45+win"": {
""wrappedProject"": ""../../LibraryBeta.PCL/LibraryBeta.PCL.csproj"",
""bin"": {
""assembly"": ""../../LibraryBeta.PCL/obj/{configuration}/LibraryBeta.dll"",
Expand All @@ -58,13 +58,6 @@ public void DnuWrapUpdatesExistingProjectJson(string flavor, string os, string a
""assembly"": ""../../LibraryBeta.PCL.Desktop/obj/{configuration}/LibraryBeta.dll"",
""pdb"": ""../../LibraryBeta.PCL.Desktop/obj/{configuration}/LibraryBeta.pdb""
}
},
""wpa81"": {
""wrappedProject"": ""../../LibraryBeta.PCL.Phone/LibraryBeta.PCL.Phone.csproj"",
""bin"": {
""assembly"": ""../../LibraryBeta.PCL.Phone/obj/{configuration}/LibraryBeta.dll"",
""pdb"": ""../../LibraryBeta.PCL.Phone/obj/{configuration}/LibraryBeta.pdb""
}
}
}
}";
Expand All @@ -77,8 +70,6 @@ public void DnuWrapUpdatesExistingProjectJson(string flavor, string os, string a
var libBetaPclCsprojPath = Path.Combine(testSolutionDir, "LibraryBeta.PCL", "LibraryBeta.PCL.csproj");
var libBetaPclDesktopCsprojPath = Path.Combine(
testSolutionDir, "LibraryBeta.PCL.Desktop", "LibraryBeta.PCL.Desktop.csproj");
var libBetaPclPhoneCsprojPath = Path.Combine(
testSolutionDir, "LibraryBeta.PCL.Phone", "LibraryBeta.PCL.Phone.csproj");
var libBetaJsonPath = Path.Combine(testSolutionDir, "src", "LibraryBeta", "project.json");
var globalJsonPath = Path.Combine(testSolutionDir, "global.json");

Expand All @@ -92,14 +83,8 @@ public void DnuWrapUpdatesExistingProjectJson(string flavor, string os, string a
subcommand: "wrap",
arguments: string.Format("\"{0}\" --msbuild \"{1}\"", libBetaPclDesktopCsprojPath, _msbuildPath));

var betaPhoneExitCode = DnuTestUtils.ExecDnu(
runtimeHomeDir,
subcommand: "wrap",
arguments: string.Format("\"{0}\" --msbuild \"{1}\"", libBetaPclPhoneCsprojPath, _msbuildPath));

Assert.Equal(0, betaPclExitCode);
Assert.Equal(0, betaDesktopExitCode);
Assert.Equal(0, betaPhoneExitCode);
Assert.Equal(expectedGlobalJson, File.ReadAllText(globalJsonPath));
Assert.False(Directory.Exists(Path.Combine(testSolutionDir, "wrap")));
Assert.Equal(expectedProjectJson, File.ReadAllText(libBetaJsonPath));
Expand Down

0 comments on commit 48059e4

Please sign in to comment.