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

Remove usage of PackagePublisher

This commit is contained in:
Nate McMaster 2017-07-28 17:17:26 -07:00
parent a8802b2d2c
commit 24f09551d9
4 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/common.props
View File

@ -20,10 +20,4 @@
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" /> <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<!--
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
<PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
</ItemGroup>
-->
</Project> </Project>

11
build/dependencies.props
View File

@ -1,11 +1,8 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<AspNetCoreVersion>1.2.0-*</AspNetCoreVersion> <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
<CoreFxVersion>4.3.0</CoreFxVersion> <InternalAspNetCoreSdkVersion>2.1.1-*</InternalAspNetCoreSdkVersion>
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion> <TestSdkVersion>15.3.0-*</TestSdkVersion>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion> <XunitVersion>2.3.0-beta2-*</XunitVersion>
<RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
<TestSdkVersion>15.0.0</TestSdkVersion>
<XunitVersion>2.2.0</XunitVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

38
build/repo.targets
View File

@ -1,15 +1,9 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<MicrosoftCommonTargetsImported>true</MicrosoftCommonTargetsImported>
<VerifyDependsOn>$(VerifyDependsOn);PublishPackage</VerifyDependsOn>
<PublishFeed>https://dotnet.myget.org/F/aspnetcoremodule/api/v2/package</PublishFeed> <PublishFeed>https://dotnet.myget.org/F/aspnetcoremodule/api/v2/package</PublishFeed>
<NuGetCommandLineVersion>3.5.0</NuGetCommandLineVersion> <VerifyDependsOn>$(VerifyDependsOn);PublishPackage</VerifyDependsOn>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="PackagePublisher" Version="2.0.0-*" />
</ItemGroup>
<Target Name="_LocateMSBuildExe"> <Target Name="_LocateMSBuildExe">
<ItemGroup> <ItemGroup>
<MSBuild15ExePaths Include="$(MSBuildProgramFiles32)\Microsoft Visual Studio\**\MSBuild\15.0\Bin\MSBuild.exe" /> <MSBuild15ExePaths Include="$(MSBuildProgramFiles32)\Microsoft Visual Studio\**\MSBuild\15.0\Bin\MSBuild.exe" />
@ -35,25 +29,23 @@
<Target Name="PackageProjects"> <Target Name="PackageProjects">
<PropertyGroup> <PropertyGroup>
<PackageVersion>1.0.0-pre-$(BuildNumber)</PackageVersion> <PackageVersion>1.0.0-pre-$(BuildNumber)</PackageVersion>
<PackageOutputPath>$(ArtifactsDir)build\</PackageOutputPath>
</PropertyGroup> </PropertyGroup>
<MSBuild <MSBuild
Projects="$(MSBuildThisFileDirectory)../nuget/AspNetCore.csproj" Projects="$(MSBuildThisFileDirectory)../nuget/AspNetCore.csproj"
Targets="Restore;Pack" Targets="Restore;Pack"
Properties="PackageVersion=$(PackageVersion);PackageOutputPath=$(PackageOutputPath)" /> Properties="PackageVersion=$(PackageVersion);PackageOutputPath=$(BuildDir)" />
</Target> </Target>
<Target Name="PublishPackage" <Target Name="PublishPackage" Condition="'$(PublishPackage)'=='true'">
DependsOnTargets="_FindDotNetPath" <ItemGroup>
Condition="'$(PublishPackage)'=='true'"> <PackagesToPush Include="$(BuildDir)*.nupkg" />
</ItemGroup>
<Exec Command="&quot;$(DotNetPath)&quot; $(PackagePublisherNetCoreApp) -d &quot;$(ArtifactsDir)\build&quot; -f $(PublishFeed)" />
<PushNuGetPackages
Packages="@(PackagesToPush)"
Feed="$(PublishFeed)"
ApiKey="$(APIKey)" />
</Target> </Target>
<Target Name="_FindDotNetPath"> </Project>
<GetDotNetHost>
<Output TaskParameter="ExecutablePath" PropertyName="DotNetPath" />
</GetDotNetHost>
</Target>
</Project>

7
test/AspNetCoreModule.Test/AspNetCoreModule.Test.csproj
View File

@ -6,7 +6,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="_app._config" /> <None Remove="_app._config" />
</ItemGroup> </ItemGroup>
@ -29,7 +29,7 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Net.Http.Headers" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Net.Http.Headers" Version="$(AspNetCoreVersion)" />
<PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" /> <PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -48,7 +48,4 @@
<Reference Include="System.Management.Automation" /> <Reference Include="System.Management.Automation" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project> </Project>