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

Adds universe manifest and signing info

This commit is contained in:
Justin Kotalik 2017-12-29 11:38:30 -08:00
parent 680afd0837
commit d59b0ef38c
6 changed files with 29 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/repo.targets
View File

@ -6,8 +6,8 @@
<Target Name="BuildNativeAssets" DependsOnTargets="GetToolsets" BeforeTargets="Compile" > <Target Name="BuildNativeAssets" DependsOnTargets="GetToolsets" BeforeTargets="Compile" >
<ItemGroup> <ItemGroup>
<BuildConfigurations Include="/p:Configuration=Release /p:platform=Win32" /> <BuildConfigurations Include="/p:Configuration=$(Configuration) /p:platform=Win32" />
<BuildConfigurations Include="/p:Configuration=Release /p:platform=x64" /> <BuildConfigurations Include="/p:Configuration=$(Configuration) /p:platform=x64" />
</ItemGroup> </ItemGroup>
<Error <Error
@ -20,11 +20,21 @@
Condition="'$(VisualStudioMSBuildx86Path)' != ''" /> Condition="'$(VisualStudioMSBuildx86Path)' != ''" />
</Target> </Target>
<ItemGroup>
<ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg">
<ArtifactType>NuGetPackage</ArtifactType>
<PackageId>Microsoft.AspNetCore.AspNetCoreModule</PackageId>
<Version>$(PackageVersion)</Version>
</ArtifactInfo>
<FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg" />
</ItemGroup>
<Target Name="PackageNativeProjects"> <Target Name="PackageNativeProjects">
<MSBuild <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\AspNetCore.nuspec"
Projects="$(MSBuildThisFileDirectory)../nuget/AspNetCore.csproj" DestinationFolder="$(BuildDir)"
Targets="Restore;Pack" Properties="version=$(PackageVersion);Configuration=$(Configuration)"
Properties="PackageVersion=$(PackageVersion);PackageOutputPath=$(BuildDir);BuildNumber=$(BuildNumber)" /> BasePath="$(RepositoryRoot)" />
</Target> </Target>
</Project> </Project>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.1.0-preview1-15638 version:2.1.0-preview1-15652
commithash:1d3a0c725dc6b8ae6b0e47800fd6b4d8f8b8d545 commithash:ab2d4a4d4e6946875ed0ce608716e91950edd18c

9
nuget/AspNetCore.csproj
View File

@ -1,9 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.0</TargetFramework>
<NuspecFile>$(MSBuildThisFileDirectory)AspNetCore.nuspec</NuspecFile>
<NuspecProperties>version=$(PackageVersion)</NuspecProperties>
</PropertyGroup>
</Project>

16
nuget/AspNetCore.nuspec
View File

@ -18,13 +18,13 @@
</contentFiles> </contentFiles>
</metadata> </metadata>
<files> <files>
<file src="..\artifacts\build\AspNetCore\bin\Release\Win32\aspnetcore.dll" target="contentFiles\any\any\x86\aspnetcore.dll" /> <file src="src\AspNetCore\bin\$Configuration$\Win32\aspnetcore.dll" target="contentFiles\any\any\x86\aspnetcore.dll" />
<file src="..\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.dll" target="contentFiles\any\any\x64\aspnetcore.dll" /> <file src="src\AspNetCore\bin\$Configuration$\x64\aspnetcore.dll" target="contentFiles\any\any\x64\aspnetcore.dll" />
<file src="..\artifacts\build\AspNetCore\bin\Release\Win32\aspnetcorerh.dll" target="contentFiles\any\any\x86\aspnetcorerh.dll" /> <file src="src\RequestHandler\bin\$Configuration$\Win32\aspnetcorerh.dll" target="contentFiles\any\any\x86\aspnetcorerh.dll" />
<file src="..\artifacts\build\AspNetCore\bin\Release\x64\aspnetcorerh.dll" target="contentFiles\any\any\x64\aspnetcorerh.dll" /> <file src="src\RequestHandler\bin\$Configuration$\x64\aspnetcorerh.dll" target="contentFiles\any\any\x64\aspnetcorerh.dll" />
<file src="..\artifacts\build\AspNetCore\bin\Release\x64\*.xml"/> <file src="src\AspNetCore\bin\$Configuration$\x64\*.xml"/>
<file src="..\tools\installancm.ps1"/> <file src="tools\installancm.ps1"/>
<file src="..\LICENSE.txt"/> <file src="LICENSE.txt"/>
<file src="Microsoft.AspNetCore.AspNetCoreModule.props" target="build\" /> <file src="nuget\Microsoft.AspNetCore.AspNetCoreModule.props" target="build\" />
</files> </files>
</package> </package>

10
src/AspNetCore/AspNetCore.vcxproj
View File

@ -71,14 +71,8 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)'=='Release'"> <PropertyGroup>
<OutDir>$(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform)\</OutDir> <OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>

19
src/RequestHandler/RequestHandler.vcxproj
View File

@ -72,25 +72,8 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup>
<LinkIncremental>true</LinkIncremental>
<TargetName>aspnetcorerh</TargetName> <TargetName>aspnetcorerh</TargetName>
<OutDir>$(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<TargetName>aspnetcorerh</TargetName>
<OutDir>$(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<TargetName>aspnetcorerh</TargetName>
<OutDir>$(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>aspnetcorerh</TargetName>
<OutDir>$(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>