huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup dotnet-watch testing

This commit is contained in:
Nate McMaster 2016-12-13 09:59:11 -08:00
parent 44c8920412
commit 08e3e0b77f
17 changed files with 67 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<AssemblyName>dotnet-sql-cache</AssemblyName> <AssemblyName>dotnet-sql-cache</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>exe</OutputType>
<Description>Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.</Description> <Description>Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.</Description>
<PackageTags>cache;distributedcache;sqlserver</PackageTags> <PackageTags>cache;distributedcache;sqlserver</PackageTags>
</PropertyGroup> </PropertyGroup>

4
src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<AssemblyName>dotnet-user-secrets</AssemblyName> <AssemblyName>dotnet-user-secrets</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>exe</OutputType>
<Description>Command line tool to manage user secrets for Microsoft.Extensions.Configuration.</Description> <Description>Command line tool to manage user secrets for Microsoft.Extensions.Configuration.</Description>
<PackageTags>configuration;secrets;usersecrets</PackageTags> <PackageTags>configuration;secrets;usersecrets</PackageTags>
<GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute> <GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
@ -17,6 +17,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/dir.props
View File

@ -11,6 +11,6 @@
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" /> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
<None Include="$(MSBuildThisFileDirectory)\prefercliruntime" Pack="true" PackagePath="\prefercliruntime" /> <None Include="$(MSBuildThisFileDirectory)\prefercliruntime" Pack="true" PackagePath="\prefercliruntime" />
<!-- required for CLI's that don't yet support the 'prevercliruntime' file --> <!-- required for CLI's that don't yet support the 'prevercliruntime' file -->
<None Include="$(ProjectRuntimeConfigFilePath)" Pack="true" PackagePath="lib\$(TargetFramework)" /> <None Include="$(ProjectRuntimeConfigFilePath)" Pack="true" PackagePath="lib\$(TargetFramework)" Condition="'$(DesignTimeBuild)'!='true'" />
</ItemGroup> </ItemGroup>
</Project> </Project>

16
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Microsoft.DotNet.Watcher.Tools.FunctionalTests.csproj
View File

@ -1,9 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\dir.props" /> <Import Project="..\dir.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFrameworks>netcoreapp1.0;netcoreapp1.1</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" Exclude="TestProjects\**\*" /> <Compile Include="**\*.cs" Exclude="TestProjects\**\*" />
<Compile Include="..\Shared\**\*.cs" /> <Compile Include="..\Shared\**\*.cs" />
@ -15,7 +18,16 @@
<ProjectReference Include="..\Microsoft.DotNet.Watcher.Tools.Tests\Microsoft.DotNet.Watcher.Tools.Tests.csproj" /> <ProjectReference Include="..\Microsoft.DotNet.Watcher.Tools.Tests\Microsoft.DotNet.Watcher.Tools.Tests.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
<PackageReference Include="Microsoft.NETCore.App" Version="1.1.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
</ItemGroup>
<Target Name="CleanTestProjects" BeforeTargets="CoreCompile;CopyFilesToOutputDirectory"> <Target Name="CleanTestProjects" BeforeTargets="CoreCompile;CopyFilesToOutputDirectory">
<RemoveDir Directories="$(TargetDir)TestProjects" Condition="Exists('$(TargetDir)TestProjects')" /> <RemoveDir Directories="$(TargetDir)TestProjects" Condition="Exists('$(TargetDir)TestProjects')" />
</Target> </Target>
</Project> </Project>

14
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Scenario/ProjectToolScenario.cs
View File

@ -127,6 +127,20 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
args.Add("--runtimeconfig"); args.Add("--runtimeconfig");
args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + ".runtimeconfig.json")); args.Add(Path.Combine(AppContext.BaseDirectory, thisAssembly + ".runtimeconfig.json"));
var currentFxVersion = AppContext.GetData("FX_DEPS_FILE") as string;
if (currentFxVersion != null)
{
// This overrides the version of shared fx in the runtimeconfig.json file.
// Tests do this to ensure dotnet-watch is executing on the version of Microsoft.NETCore.App
// used by the current test project. The test project can target multiple version of
// netcoreapp1.x in order to ensure the tool runs when it is lifted to higher netcore versions
// due to inclusion of the 'prefercliruntime' file in our nupkg.
var version = new FileInfo(currentFxVersion).Directory.Name;
args.Add("--fx-version");
args.Add(version);
}
args.Add(Path.Combine(AppContext.BaseDirectory, "dotnet-watch.dll")); args.Add(Path.Combine(AppContext.BaseDirectory, "dotnet-watch.dll"));
return args; return args;

5
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/AppWithDeps.csproj
View File

@ -1,12 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" /> <Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" /> <EmbeddedResource Include="**\*.resx" />
<ProjectReference Include="..\Dependency\Dependency.csproj" /> <ProjectReference Include="..\Dependency\Dependency.csproj" />
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" /> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/AppWithDeps/NuGet.config
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
</packageSources>
</configuration>

5
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/Dependency/Dependency.csproj
View File

@ -1,11 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard1.5</TargetFramework> <TargetFramework>netstandard1.5</TargetFramework>
<OutputType>Library</OutputType> <OutputType>library</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" /> <Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" /> <EmbeddedResource Include="**\*.resx" />
<PackageReference Include="NETStandard.Library" Version="1.6.0" /> <PackageReference Include="NETStandard.Library" Version="1.6.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/Dependency/NuGet.config
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
</packageSources>
</configuration>

5
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/GlobbingApp.csproj
View File

@ -1,11 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Program.cs;include\*.cs" Exclude="exclude\*" /> <Compile Include="Program.cs;include\*.cs" Exclude="exclude\*" />
<EmbeddedResource Include="**\*.resx" /> <EmbeddedResource Include="**\*.resx" />
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" /> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/GlobbingApp/NuGet.config
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
</packageSources>
</configuration>

5
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NoDepsApp.csproj
View File

@ -1,11 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" /> <Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" /> <EmbeddedResource Include="**\*.resx" />
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" /> <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/TestProjects/NoDepsApp/NuGet.config
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
</packageSources>
</configuration>

9
test/Microsoft.DotNet.Watcher.Tools.Tests/Microsoft.DotNet.Watcher.Tools.Tests.csproj
View File

@ -1,9 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\dir.props" /> <Import Project="..\dir.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" /> <Compile Include="**\*.cs" />
<Compile Include="..\Shared\**\*.cs" /> <Compile Include="..\Shared\**\*.cs" />
@ -11,5 +14,7 @@
<Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchOuter.targets" Link="toolassets\DotNetWatchOuter.targets" CopyToOutputDirectory="PreserveNewest" /> <Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchOuter.targets" Link="toolassets\DotNetWatchOuter.targets" CopyToOutputDirectory="PreserveNewest" />
<Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchCommon.targets" Link="toolassets\DotNetWatchCommon.targets" CopyToOutputDirectory="PreserveNewest" /> <Content Include="..\..\src\Microsoft.DotNet.Watcher.Tools\toolassets\DotNetWatchCommon.targets" Link="toolassets\DotNetWatchCommon.targets" CopyToOutputDirectory="PreserveNewest" />
<ProjectReference Include="..\..\src\Microsoft.DotNet.Watcher.Tools\Microsoft.DotNet.Watcher.Tools.csproj" /> <ProjectReference Include="..\..\src\Microsoft.DotNet.Watcher.Tools\Microsoft.DotNet.Watcher.Tools.csproj" />
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
</ItemGroup> </ItemGroup>
</Project>
</Project>

7
test/Microsoft.Extensions.SecretManager.Tools.Tests/Microsoft.Extensions.SecretManager.Tools.Tests.csproj
View File

@ -1,12 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\dir.props" /> <Import Project="..\dir.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" /> <Compile Include="**\*.cs" />
<Compile Include="..\Shared\**\*.cs" /> <Compile Include="..\Shared\**\*.cs" />
<ProjectReference Include="..\..\src\Microsoft.Extensions.SecretManager.Tools\Microsoft.Extensions.SecretManager.Tools.csproj" /> <ProjectReference Include="..\..\src\Microsoft.Extensions.SecretManager.Tools\Microsoft.Extensions.SecretManager.Tools.csproj" />
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

7
test/Microsoft.Extensions.Tools.Tests/Microsoft.Extensions.Tools.Tests.csproj
View File

@ -1,11 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\dir.props" /> <Import Project="..\dir.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<OutputType>Exe</OutputType> <OutputType>exe</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="**\*.cs" /> <Compile Include="**\*.cs" />
<Compile Include="..\..\shared\**\*.cs" /> <Compile Include="..\..\shared\**\*.cs" />
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
test/dir.props
View File

@ -2,7 +2,6 @@
<Import Project="..\dir.props" /> <Import Project="..\dir.props" />
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />