One project (two frameworks), one test.

huangpf · Oct 19, 2017 · 1a063df · 1a063df
1 parent 1b3d6e8
commit 1a063df
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 237 deletions.
diff --git a/experiments/Azure.Experiments/Azure.Experiments.sln b/experiments/Azure.Experiments/Azure.Experiments.sln
@@ -3,36 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2002
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Standard.Tests", "Standard.Tests\Standard.Tests.csproj", "{76A7A65A-99E9-44B3-A5C4-404905AABAF5}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared.Tests", "Shared.Tests\Shared.Tests.shproj", "{4E5EA79D-BB89-42F1-A46D-3289F70FC26D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Tests", "DotNet.Tests\DotNet.Tests.csproj", "{CC3A34AA-D62B-4352-8A44-5E3380216905}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Experiments", "Azure.Experiments\Azure.Experiments.csproj", "{1D707014-5D2B-4C4E-9D1A-3A449A234329}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{636E4926-8F71-4D98-8169-4261AD4B754D}"
+EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		Shared.Tests\Shared.Tests.projitems*{4e5ea79d-bb89-42f1-a46d-3289f70fc26d}*SharedItemsImports = 13
-		Shared.Tests\Shared.Tests.projitems*{cc3a34aa-d62b-4352-8a44-5e3380216905}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{76A7A65A-99E9-44B3-A5C4-404905AABAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76A7A65A-99E9-44B3-A5C4-404905AABAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76A7A65A-99E9-44B3-A5C4-404905AABAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76A7A65A-99E9-44B3-A5C4-404905AABAF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC3A34AA-D62B-4352-8A44-5E3380216905}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC3A34AA-D62B-4352-8A44-5E3380216905}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC3A34AA-D62B-4352-8A44-5E3380216905}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC3A34AA-D62B-4352-8A44-5E3380216905}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1D707014-5D2B-4C4E-9D1A-3A449A234329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1D707014-5D2B-4C4E-9D1A-3A449A234329}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D707014-5D2B-4C4E-9D1A-3A449A234329}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D707014-5D2B-4C4E-9D1A-3A449A234329}.Release|Any CPU.Build.0 = Release|Any CPU
+		{636E4926-8F71-4D98-8169-4261AD4B754D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{636E4926-8F71-4D98-8169-4261AD4B754D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{636E4926-8F71-4D98-8169-4261AD4B754D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{636E4926-8F71-4D98-8169-4261AD4B754D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/experiments/Azure.Experiments/Azure.Experiments/Azure.Experiments.csproj b/experiments/Azure.Experiments/Azure.Experiments/Azure.Experiments.csproj
@@ -12,9 +12,10 @@
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="16.3.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="15.0.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
-    <PackageReference Include="System.Net.Http" Version="4.3.0" />
   </ItemGroup>
 
-  <Import Project="..\Shared\Azure.Experiments.Shared.projitems" Label="Shared" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+    <PackageReference Include="System.Net.Http" Version="4.3.0" />
+  </ItemGroup>
 
 </Project>
diff --git a/experiments/Azure.Experiments/DotNet.Tests/DotNet.Tests.csproj b/experiments/Azure.Experiments/DotNet.Tests/DotNet.Tests.csproj
diff --git a/experiments/Azure.Experiments/DotNet.Tests/Properties/AssemblyInfo.cs b/experiments/Azure.Experiments/DotNet.Tests/Properties/AssemblyInfo.cs
diff --git a/experiments/Azure.Experiments/DotNet.Tests/packages.config b/experiments/Azure.Experiments/DotNet.Tests/packages.config
diff --git a/experiments/Azure.Experiments/Shared.Tests/Shared.Tests.projitems b/experiments/Azure.Experiments/Shared.Tests/Shared.Tests.projitems
diff --git a/experiments/Azure.Experiments/Shared.Tests/Shared.Tests.shproj b/experiments/Azure.Experiments/Shared.Tests/Shared.Tests.shproj
diff --git a/experiments/Azure.Experiments/Shared/Azure.Experiments.Shared.projitems b/experiments/Azure.Experiments/Shared/Azure.Experiments.Shared.projitems
diff --git a/experiments/Azure.Experiments/Shared/Shared.shproj b/experiments/Azure.Experiments/Shared/Shared.shproj
diff --git a/...ts/Shared.Tests/AuthenticationResponse.cs → ...periments/Tests/AuthenticationResponse.cs b/...ts/Shared.Tests/AuthenticationResponse.cs → ...periments/Tests/AuthenticationResponse.cs
diff --git a/...e.Experiments/Shared.Tests/ComputeTest.cs → ...ts/Azure.Experiments/Tests/ComputeTest.cs b/...e.Experiments/Shared.Tests/ComputeTest.cs → ...ts/Azure.Experiments/Tests/ComputeTest.cs
diff --git a/...Experiments/Shared.Tests/Configuration.cs → .../Azure.Experiments/Tests/Configuration.cs b/...Experiments/Shared.Tests/Configuration.cs → .../Azure.Experiments/Tests/Configuration.cs
diff --git a/...e.Experiments/Shared.Tests/Credentials.cs → ...ts/Azure.Experiments/Tests/Credentials.cs b/...e.Experiments/Shared.Tests/Credentials.cs → ...ts/Azure.Experiments/Tests/Credentials.cs
diff --git a/....Experiments/Shared.Tests/KeyValuePair.cs → ...s/Azure.Experiments/Tests/KeyValuePair.cs b/....Experiments/Shared.Tests/KeyValuePair.cs → ...s/Azure.Experiments/Tests/KeyValuePair.cs
diff --git a/...ents/Standard.Tests/Standard.Tests.csproj → ...ents/Azure.Experiments/Tests/Tests.csproj b/...ents/Standard.Tests/Standard.Tests.csproj → ...ents/Azure.Experiments/Tests/Tests.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net4.5.2</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
     <PackageReference Include="xunit" Version="2.3.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
   </ItemGroup>
@@ -17,6 +16,4 @@
     <ProjectReference Include="..\Azure.Experiments\Azure.Experiments.csproj" />
   </ItemGroup>
 
-  <Import Project="..\Shared.Tests\Shared.Tests.projitems" Label="Shared" />
-
 </Project>
diff --git a/...Experiments/Shared.Tests/TokenProvider.cs → .../Azure.Experiments/Tests/TokenProvider.cs b/...Experiments/Shared.Tests/TokenProvider.cs → .../Azure.Experiments/Tests/TokenProvider.cs