Remove redundant references and fixup MSBuild target test

aspnet · Jan 6, 2017 · a91f16e · a91f16e
1 parent 0e6cf70
commit a91f16e
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 190 deletions.
diff --git a/samples/KeyVaultSample/KeyVaultSample.csproj b/samples/KeyVaultSample/KeyVaultSample.csproj
@@ -30,20 +30,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Threading.Tasks">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Runtime">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>

diff --git a/...sions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.csproj b/...sions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.csproj
@@ -22,16 +22,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Threading.Tasks" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.13.5" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="2.0.6" />

diff --git a/...ation.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/...ation.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj
@@ -25,10 +25,4 @@
     <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/...ons.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.csproj b/...ons.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.csproj
@@ -26,12 +26,6 @@
     <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Collections" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="System.Threading.Thread" Version="4.4.0-*" />
   </ItemGroup>

diff --git a/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.csproj b/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.csproj
@@ -22,15 +22,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>

diff --git a/src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.csproj b/src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.csproj
@@ -22,15 +22,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Runtime" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />

diff --git a/...xtensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.csproj b/...xtensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.csproj
@@ -29,17 +29,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>

diff --git a/src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.csproj b/src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.csproj
@@ -22,19 +22,13 @@
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Runtime" />
     <Reference Include="System.Security" />
     <Reference Include="System.Xml" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

diff --git a/...iguration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.csproj b/...iguration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.csproj
@@ -25,20 +25,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Threading.Tasks">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Runtime">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />

diff --git a/...xtensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.csproj b/...xtensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.csproj
@@ -32,9 +32,4 @@
     <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/...Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.csproj b/...Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.csproj
@@ -32,9 +32,4 @@
     <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/...ronmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.csproj b/...ronmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.csproj
@@ -22,14 +22,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />

diff --git a/...uration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.csproj b/...uration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.csproj
@@ -21,14 +21,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />

diff --git a/...s.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj b/...s.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj
@@ -27,23 +27,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Security">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Xml">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />

diff --git a/...soft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.csproj b/...soft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.csproj
@@ -25,17 +25,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />

diff --git a/...ft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.csproj b/...ft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.csproj
@@ -25,17 +25,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />

diff --git a/...xtensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj b/...xtensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj
@@ -23,9 +23,4 @@
     <PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.csproj b/test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.csproj
@@ -22,14 +22,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />

diff --git a/...Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.csproj b/...Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.csproj
@@ -27,15 +27,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />

diff --git a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs b/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs
@@ -42,10 +42,12 @@ public void GeneratesAssemblyAttributeFile()
             }
             var target = Path.Combine(_solutionRoot.FullName, "src", "Microsoft.Extensions.Configuration.UserSecrets", "build", "netstandard1.0", "Microsoft.Extensions.Configuration.UserSecrets.targets");
             Directory.CreateDirectory(Path.Combine(_tempDir, "obj"));
+            var libName = "Microsoft.Extensions.Configuration.UserSecrets.dll";
+            File.Copy(Path.Combine(AppContext.BaseDirectory, libName), Path.Combine(_tempDir, libName));
             File.Copy(target, Path.Combine(_tempDir, "obj", "test.csproj.usersecretstest.targets")); // imitates how NuGet will import this target
             var testProj = Path.Combine(_tempDir, "test.csproj");
             // should represent a 'dotnet new' project
-            File.WriteAllText(testProj, @"
+            File.WriteAllText(testProj, $@"
 <Project Sdk=""Microsoft.NET.Sdk"" ToolsVersion=""15.0"">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -55,6 +57,7 @@ public void GeneratesAssemblyAttributeFile()
     <ItemGroup>
         <Compile Include=""Program.cs""/>
         <PackageReference Include=""Microsoft.NETCore.App"" Version=""1.0.1"" />
+        <Reference Include=""$(MSBuildThisFileDirectory){libName}"" />
     </ItemGroup>
 </Project>
 ");
@@ -82,16 +85,18 @@ public void GeneratesAssemblyAttributeFile()
                 UseShellExecute = false,
                 WorkingDirectory = _tempDir
             };
-            Process.Start(buildInfo).WaitForExit();
-            // build will fail because the test proj doesn't reference UserSecrets.dll
-            // but that's okay. We just want to verify the target generates code correctly
+            var build = Process.Start(buildInfo);
+            build.WaitForExit();
+            Assert.Equal(0, build.ExitCode);
 
             Assert.True(File.Exists(assemblyInfoFile));
             var contents = File.ReadAllText(assemblyInfoFile);
             Assert.Contains("[assembly: Microsoft.Extensions.Configuration.UserSecrets.UserSecretsIdAttribute(\"xyz123\")]", contents);
             var lastWrite = new FileInfo(assemblyInfoFile).LastWriteTimeUtc;
 
-            Process.Start(buildInfo).WaitForExit();
+            var rebuild = Process.Start(buildInfo);
+            rebuild.WaitForExit();
+            Assert.Equal(0, rebuild.ExitCode);
             // asserts that the target doesn't re-generate assembly file. Important for incremental build.
             Assert.Equal(lastWrite, new FileInfo(assemblyInfoFile).LastWriteTimeUtc);
         }
@@ -100,7 +105,7 @@ public void Dispose()
         {
             try
             {
-                Directory.Delete(_tempDir, recursive: true);
+          //      Directory.Delete(_tempDir, recursive: true);
             }
             catch
             {

diff --git a/...soft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.csproj b/...soft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.csproj
@@ -26,20 +26,12 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Runtime">
-      <FromP2P>true</FromP2P>
-    </Reference>
-    <Reference Include="System.Collections">
-      <FromP2P>true</FromP2P>
-    </Reference>
     <Reference Include="System.Security">
       <FromP2P>true</FromP2P>
     </Reference>
     <Reference Include="System.Xml">
       <FromP2P>true</FromP2P>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
   <ItemGroup>