Update Microsoft.AspNetCore.Routing.DecisionTree.Sources to use contentFiles

This commit is contained in:
Nate McMaster 2016-12-14 09:44:39 -08:00
Родитель 54297fb7fb
Коммит 45247e4d9c
14 изменённых файлов: 54 добавлений и 64 удалений

Просмотреть файл

@ -19,8 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing.DecisionTree.Sources", "src\Microsoft.AspNetCore.Routing.DecisionTree.Sources\Microsoft.AspNetCore.Routing.DecisionTree.Sources.xproj", "{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests", "test\Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests\Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.xproj", "{09C2933C-23AC-41B7-994D-E8A5184A629C}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Routing.Abstractions", "src\Microsoft.AspNetCore.Routing.Abstractions\Microsoft.AspNetCore.Routing.Abstractions.xproj", "{ED253B01-24F1-43D1-AA0B-079391E105A9}"
@ -69,17 +67,6 @@ Global
{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|x86.ActiveCfg = Release|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Debug|x86.ActiveCfg = Debug|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Debug|x86.Build.0 = Debug|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Release|Any CPU.Build.0 = Release|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Release|x86.ActiveCfg = Release|Any CPU
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8}.Release|x86.Build.0 = Release|Any CPU
{09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@ -136,7 +123,6 @@ Global
{1EE54D32-6CED-4206-ACF5-3DC1DD39D228} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3}
{636D79ED-7B32-487C-BDA5-D2A1AAA97371} = {95359B4B-4C85-4B44-A75B-0621905C4CF6}
{DB94E647-C73A-4F52-A126-AA7544CCF33B} = {C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E}
{ABD5AA59-6000-4A3D-A54F-4B636F725AE8} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3}
{09C2933C-23AC-41B7-994D-E8A5184A629C} = {95359B4B-4C85-4B44-A75B-0621905C4CF6}
{ED253B01-24F1-43D1-AA0B-079391E105A9} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3}
{741B0B05-CE96-473B-B962-6B0A347DF79A} = {95359B4B-4C85-4B44-A75B-0621905C4CF6}

33
makefile.shade Normal file
Просмотреть файл

@ -0,0 +1,33 @@
var VersionPrefix = '1.2.0'
var VERSION='0.1'
var FULL_VERSION='0.1'
use-standard-lifecycle
k-standard-goals
#pack-sources target='compile'
@{
var nugetPath = E("KOREBUILD_NUGET_EXE") ?? ".build/nuget.exe";
var outputDir = Path.Combine(Directory.GetCurrentDirectory(), "artifacts/build/");
var versionSuffix = E("DOTNET_BUILD_VERSION");
var packageVersion = VersionPrefix;
if (!string.IsNullOrEmpty(versionSuffix))
{
packageVersion += "-" + versionSuffix;
}
var sharedDir = Path.Combine(Directory.GetCurrentDirectory(), "shared");
foreach (var dir in Directory.GetDirectories(sharedDir, "*.Sources"))
{
var id = Path.GetFileName(dir);
NugetPack(nugetPath,
Path.Combine(sharedDir, "sources.nuspec"),
outputDir,
packageVersion,
"-BasePath \"" + dir + "\" -Properties id=" + id);
}
}
macro name='NugetPack' nugetPath='string' nuspecFile='string' outputDir='string' packageVersion='string' extra='string'
nuget-pack

17
shared/sources.nuspec Normal file
Просмотреть файл

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>$id$</id>
<version>$version$</version>
<authors>Microsoft</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$id$</description>
<serviceable>true</serviceable>
<contentFiles>
<files include="contentFiles/cs/**/*.cs" buildAction="Compile" />
</contentFiles>
</metadata>
<files>
<file src="**\*.cs" target="contentFiles/cs/netstandard1.0/" />
</files>
</package>

Просмотреть файл

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>abd5aa59-6000-4a3d-a54f-4b636f725ae8</ProjectGuid>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

Просмотреть файл

@ -1,23 +0,0 @@
{
"description": "Components for building a DecisionTree.",
"version": "1.2.0-*",
"packOptions": {
"repository": {
"type": "git",
"url": "git://github.com/aspnet/routing"
}
},
"buildOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"shared": "**/*.cs",
"frameworks": {
"net451": {},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.1-*"
}
}
}
}

Просмотреть файл

@ -17,17 +17,14 @@
"nowarn": [
"CS1591"
],
"xmlDoc": true
"xmlDoc": true,
"compile": "../../shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/**/*.cs"
},
"dependencies": {
"Microsoft.AspNetCore.Http.Extensions": "1.2.0-*",
"Microsoft.AspNetCore.Routing.Abstractions": {
"target": "project"
},
"Microsoft.AspNetCore.Routing.DecisionTree.Sources": {
"type": "build",
"target": "project"
},
"Microsoft.Extensions.HashCodeCombiner.Sources": {
"type": "build",
"version": "1.2.0-*"

Просмотреть файл

@ -1,14 +1,11 @@
{
"buildOptions": {
"warningsAsErrors": true
"warningsAsErrors": true,
"compile": "../../shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/**/*.cs"
},
"dependencies": {
"dotnet-test-xunit": "2.2.0-*",
"Microsoft.AspNetCore.Routing": "1.2.0-*",
"Microsoft.AspNetCore.Routing.DecisionTree.Sources": {
"type": "build",
"version": "1.2.0-*"
},
"Microsoft.AspNetCore.Testing": "1.2.0-*",
"xunit": "2.2.0-*"
},