aspnet
/
Configuration
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Remove redundant references and fixup MSBuild target test

This commit is contained in:
Nate McMaster 2017-01-05 17:36:26 -08:00
Родитель 0e6cf70fcc
Коммит a91f16ee10
21 изменённых файлов: 16 добавлений и 191 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
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>

10
src/Microsoft.Extensions.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" />

6
src/Microsoft.Extensions.Configuration.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>

6
src/Microsoft.Extensions.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>

9
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>

9
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" />

11
src/Microsoft.Extensions.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>

16
src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.csproj
Просмотреть файл

@ -22,21 +22,15 @@
</ProjectReference>
</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)' == 'net451' ">
<Reference Include="System.Security" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Xml.XmlDocument" Version="4.4.0-*" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.4.0-*" />

14
test/Microsoft.Extensions.Configuration.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" />

5
test/Microsoft.Extensions.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>

5
test/Microsoft.Extensions.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>

8
test/Microsoft.Extensions.Configuration.EnvironmentVariables.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" />

8
test/Microsoft.Extensions.Configuration.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" />

17
test/Microsoft.Extensions.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" />

11
test/Microsoft.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" />

11
test/Microsoft.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" />

5
test/Microsoft.Extensions.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>

8
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" />

9
test/Microsoft.Extensions.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" />

17
test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs
Просмотреть файл

@ -42,10 +42,12 @@ namespace Microsoft.Extensions.Configuration.UserSecrets
}
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 @@ namespace Microsoft.Extensions.Configuration.UserSecrets
<ItemGroup>
<Compile Include=""Program.cs""/>
<PackageReference Include=""Microsoft.NETCore.App"" Version=""1.0.1"" />
<Reference Include=""$(MSBuildThisFileDirectory){libName}"" />
</ItemGroup>
</Project>
");
@ -82,16 +85,18 @@ namespace Microsoft.Extensions.Configuration.UserSecrets
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 @@ namespace Microsoft.Extensions.Configuration.UserSecrets
{
try
{
Directory.Delete(_tempDir, recursive: true);
// Directory.Delete(_tempDir, recursive: true);
}
catch
{

8
test/Microsoft.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>