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

Revert Antares test bundle changes (#220)

This commit is contained in:
Pavel Krymets 2017-09-18 11:01:10 -07:00 committed by GitHub
parent d1d934e990
commit f8ee044efa
6 changed files with 3 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MetaPackages.sln
View File

@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.10
VisualStudioVersion = 15.0.26510.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}"
ProjectSection(SolutionItems) = preProject
@ -50,8 +50,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrimDeps", "tools\TrimDeps\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjectionApp", "test\TestSites\DependencyInjectionApp\DependencyInjectionApp.csproj", "{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.TestBundle", "src\Microsoft.AspNetCore.AzureAppServices.TestBundle\Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj", "{AE5CCCE0-9AD7-4AB3-B732-FC049766331C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -98,10 +96,6 @@ Global
{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Release|Any CPU.Build.0 = Release|Any CPU
{AE5CCCE0-9AD7-4AB3-B732-FC049766331C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE5CCCE0-9AD7-4AB3-B732-FC049766331C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE5CCCE0-9AD7-4AB3-B732-FC049766331C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE5CCCE0-9AD7-4AB3-B732-FC049766331C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -119,9 +113,5 @@ Global
{79CF58CE-B020-45D8-BDB5-2D8036BEAD14} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4}
{67E4C92F-6D12-4C52-BB79-B8D11BFC6B82} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4}
{AE5CCCE0-9AD7-4AB3-B732-FC049766331C} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {500600F2-E434-4372-B04D-39CAAADFF973}
EndGlobalSection
EndGlobal

27
build/SiteExtension.targets
View File

@ -1,27 +0,0 @@
<Project>
<Target Name="BuildSiteExtension">
<GetDotNetHost>
<Output TaskParameter="DotNetDirectory" PropertyName="DotnetHomeDirectory" />
</GetDotNetHost>
<PropertyGroup>
<FallbackArchive>$(COHERENCE_SIGNED_DROP_LOCATION)\fallbackArchives\nuGetPackagesArchive-$(TimestampVersion).zip</FallbackArchive>
<RuntimeStore>$(COHERENCE_SIGNED_DROP_LOCATION)\Signed\PackageCache\aspnetcore-store-$(TimestampVersion)-win7-x86.zip</RuntimeStore>
</PropertyGroup>
<PropertyGroup>
<FallbackArchiveDestination>$(TempDir)FallbackArchive</FallbackArchiveDestination>
<RuntimeStoreDestination>$(TempDir)RuntimeStore</RuntimeStoreDestination>
</PropertyGroup>
<UnzipArchive File="$(FallbackArchive)" Destination="$(FallbackArchiveDestination)" Overwrite="true" />
<UnzipArchive File="$(RuntimeStore)" Destination="$(RuntimeStoreDestination)" Overwrite="true" />
<MSBuild Projects="$(RepositoryRoot)src\Microsoft.AspNetCore.AzureAppServices.TestBundle\Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj"
Targets="Pack"
Properties="DotnetHomeDirectory=$(DotnetHomeDirectory);FallbackArchiveDestination=$(FallbackArchiveDestination);RuntimeStoreDestination=$(RuntimeStoreDestination)" />
</Target>
</Project>

1
build/repo.props
View File

@ -4,6 +4,5 @@
<ItemGroup>
<ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.AspNetCore.RuntimeStore\Microsoft.AspNetCore.RuntimeStore.csproj" />
<ExcludeFromPack Include="$(RepositoryRoot)src\Archive.AspNetCore.All\Archive.AspNetCore.All.csproj" />
<ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.AspNetCore.AzureAppServices.TestBundle\Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj" />
</ItemGroup>
</Project>

21
build/repo.targets
View File

@ -63,8 +63,6 @@
<DockerRootDirectory>/opt/code/</DockerRootDirectory>
</PropertyGroup>
<Import Project="SiteExtension.targets" />
<Target Name="UpdateNuGetConfig">
<UpdatePackageSource
NuGetConfigPath="$(RepositoryRoot)NuGet.config"
@ -235,7 +233,6 @@
<PropertyGroup>
<FallbackStagingDir>$(FallbackArchiveDir)obj/$(OutputPackageName)</FallbackStagingDir>
<FallbackOutputArchive>$(RepositoryRoot)artifacts\$(OutputPackageName).lzma</FallbackOutputArchive>
<FallbackOutputArchiveZip>$(RepositoryRoot)artifacts\$(OutputPackageName).zip</FallbackOutputArchiveZip>
<FallbackRestoreConfigFile>$(FallbackArchiveDir)\obj\$(OutputPackageName).NuGet.config</FallbackRestoreConfigFile>
</PropertyGroup>
@ -253,13 +250,7 @@
<MSBuild Projects="$(FallbackArchiveProj)" Targets="Restore" Properties="RestorePackagesPath=$(FallbackStagingDir);AspNetPackageVersion=$(AspNetPackageVersion);RestoreConfigFile=$(FallbackRestoreConfigFile)" />
<!-- Create the archive -->
<Message Text="Producing LZMA and ZIP Archives, this may take a while..." Importance="high" />
<ItemGroup>
<FallbackOutputFiles Include="$(FallbackStagingDir)\**\*.*" />
</ItemGroup>
<ZipArchive File="$(FallbackOutputArchiveZip)" SourceFiles="@(FallbackOutputFiles)" WorkingDirectory="$(FallbackStagingDir)" Overwrite="true"/>
<Message Text="Producing LZMA Archive, this may take a while..." Importance="high" />
<Exec Command="$(ArchiverPath) -a $(FallbackOutputArchive) $(FallbackStagingDir)" />
</Target>
@ -287,15 +278,7 @@
<PropertyGroup>
<PublishDir Condition="'$(PublishShare)' != ''">$(PublishShare)\fallbackArchives</PublishDir>
</PropertyGroup>
<Copy
SourceFiles="
$(RepositoryRoot)artifacts\$(TimestampOutputPackageName).lzma;
$(RepositoryRoot)artifacts\$(NoTimestampOutputPackageName).lzma;
$(RepositoryRoot)artifacts\$(TimestampOutputPackageName).zip;
$(RepositoryRoot)artifacts\$(NoTimestampOutputPackageName).zip"
DestinationFolder="$(PublishDir)"
Condition="'$(PublishDir)' != ''" />
<Copy SourceFiles="$(RepositoryRoot)artifacts\$(TimestampOutputPackageName).lzma;$(RepositoryRoot)artifacts\$(NoTimestampOutputPackageName).lzma" DestinationFolder="$(PublishDir)" Condition="'$(PublishDir)' != ''" />
</Target>
<Target Name="AddManifestsToNupkg">

51
src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj
View File

@ -1,51 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<title>ASP.NET Core Extensions</title>
<Description>This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging.</Description>
<TargetFramework>net461</TargetFramework>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<PackageTags>aspnet;logging;aspnetcore;AzureSiteExtension</PackageTags>
<PackageType>AzureSiteExtension</PackageType>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<ContentTargetFolders>content</ContentTargetFolders>
<!-- These need to be set manually because this is not marked as a shipping (to nuget.org) package. https://github.com/aspnet/AzureIntegration/issues/38 -->
<PackageLicenseUrl>https://github.com/aspnet/AzureIntegration/blob/rel/2.0.0-preview1/LICENSE.txt</PackageLicenseUrl>
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
<PackageProjectUrl>https://www.asp.net/</PackageProjectUrl>
</PropertyGroup>
<ItemGroup>
<Content Include="applicationHost.xdt" />
<!-- <Content Include="bin\$(Configuration)\$(TargetFramework)\Microsoft.Web.Xdt.Extensions.dll" PackagePath="content" /> -->
</ItemGroup>
<Target Name="PackTaskDependencies" BeforeTargets="GenerateNuspec">
<Message Text="Collecting package files from $(DotnetHomeDirectory), $(FallbackArchiveDestination), $(RuntimeStoreDestination)" Importance="high" />
<ItemGroup>
<_PackageFiles Include="$(DotnetHomeDirectory)\**\*.*" Exclude="$(DotnetHomeDirectory)\sdk\NuGetFallbackFolder\**\*.*;$(DotnetHomeDirectory)\store\**\*.*;$(DotnetHomeDirectory)\additionalDeps\**\*.*" Condition="$(DotnetHomeDirectory) != ''">
<PackagePath>tools\</PackagePath>
<Visible>false</Visible>
<BuildAction>Content</BuildAction>
</_PackageFiles>
<_PackageFiles Include="$(FallbackArchiveDestination)\**\*.*" Condition="$(FallbackArchiveDestination) != ''">
<PackagePath>tools\sdk\NuGetFallbackFolder\</PackagePath>
<Visible>false</Visible>
<BuildAction>Content</BuildAction>
</_PackageFiles>
<_PackageFiles Include="$(RuntimeStoreDestination)\**\*.*" Condition="$(RuntimeStoreDestination) != ''">
<PackagePath>tools\</PackagePath>
<Visible>false</Visible>
<BuildAction>Content</BuildAction>
</_PackageFiles>
</ItemGroup>
</Target>
</Project>

15
src/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt
View File

@ -1,15 +0,0 @@
<?xml version="1.0"?>
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<xdt:Import path="%XDT_EXTENSIONPATH%\Microsoft.Web.Xdt.Extensions.dll"
namespace="Microsoft.Web.Xdt.Extensions" />
<system.webServer xdt:Transform="InsertIfMissing">
<runtime xdt:Transform="InsertIfMissing" >
<environmentVariables xdt:Transform="InsertIfMissing">
<add name="PATH" value="%XDT_EXTENSIONPATH%\tools" xdt:Locator="Match(name)" xdt:Transform="InsertOrAppendAttribute(Attribute='value')" />
<add name="DOTNET_ADDITIONAL_DEPS" value="%XDT_EXTENSIONPATH%\tools\Microsoft.AspNetCore.AzureAppServices.HostingStartup\" xdt:Locator="Match(name)" xdt:Transform="InsertOrAppendAttribute(Attribute='value')" />
</environmentVariables>
</runtime>
</system.webServer>
</configuration>