From 83fe4c089b22a500debc33bed758e2d9d2d8f64b Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Thu, 1 Nov 2018 11:30:31 -0700
Subject: [PATCH] Remove M.A.Server.IIS package from 2.1. Fix signing issues
(#3859)
---
build/artifacts.props | 1 -
src/IISIntegration/IISIntegration.sln | 15 -----
src/IISIntegration/build/repo.targets | 18 ------
.../Microsoft.AspNetCore.Server.IIS.csproj | 56 -------------------
.../Microsoft.AspNetCore.Server.IIS.nuspec | 32 -----------
.../Microsoft.AspNetCore.Server.IIS.targets | 9 ---
.../src/Microsoft.AspNetCore.Server.IIS/_._ | 0
7 files changed, 131 deletions(-)
delete mode 100644 src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
delete mode 100644 src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec
delete mode 100644 src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets
delete mode 100644 src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._
diff --git a/build/artifacts.props b/build/artifacts.props
index a3fe35515b6..39b35505e61 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -135,7 +135,6 @@
<PackageArtifact Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Routing" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Server.HttpSys" AllMetapackage="true" AppMetapackage="true" Category="ship" />
- <PackageArtifact Include="Microsoft.AspNetCore.Server.IIS" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " />
<PackageArtifact Include="Microsoft.AspNetCore.Server.IISIntegration" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
diff --git a/src/IISIntegration/IISIntegration.sln b/src/IISIntegration/IISIntegration.sln
index 50d11124bca..15788f02733 100644
--- a/src/IISIntegration/IISIntegration.sln
+++ b/src/IISIntegration/IISIntegration.sln
@@ -60,8 +60,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InProcessWebSite", "test\We
{439824F9-1455-4CC4-BD79-B44FA0A16552} = {439824F9-1455-4CC4-BD79-B44FA0A16552}
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StressTestWebSite", "test\WebSites\StressTestWebSite\StressTestWebSite.csproj", "{13FD8F12-FFBE-4D01-B4AC-444F2994B04F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "test\TestTasks\TestTasks.csproj", "{064D860B-4D7C-4B1D-918F-E020F1B99E2A}"
@@ -180,18 +178,6 @@ Global
{679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x64.Build.0 = Release|x64
{679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.ActiveCfg = Release|x86
{679FA2A2-898B-4320-884E-C2D294A97CE1}.Release|x86.Build.0 = Release|x86
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.ActiveCfg = Debug|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.Build.0 = Debug|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.ActiveCfg = Debug|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.Build.0 = Debug|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|Any CPU.Build.0 = Release|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.ActiveCfg = Release|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|Any CPU
- {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|Any CPU
{13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|Any CPU.ActiveCfg = Debug|x86
{13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.ActiveCfg = Debug|x64
{13FD8F12-FFBE-4D01-B4AC-444F2994B04F}.Debug|x64.Build.0 = Debug|x64
@@ -296,7 +282,6 @@ Global
{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{9BC4AFCB-325D-4C81-8228-8CF301CE2F97} = {C74B8F36-FD2F-45C9-9B8A-00E7CF0126A9}
{679FA2A2-898B-4320-884E-C2D294A97CE1} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
- {46A8612B-418B-4D70-B3A7-A21DD0627473} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD}
{13FD8F12-FFBE-4D01-B4AC-444F2994B04F} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
{064D860B-4D7C-4B1D-918F-E020F1B99E2A} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
{744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
diff --git a/src/IISIntegration/build/repo.targets b/src/IISIntegration/build/repo.targets
index c39d7367c51..97753f24241 100644
--- a/src/IISIntegration/build/repo.targets
+++ b/src/IISIntegration/build/repo.targets
@@ -42,21 +42,7 @@
<Version>$(PackageVersion)</Version>
<RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
</ArtifactInfo>
- <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV1.$(PackageVersion).nupkg" />
- <ArtifactInfo Include="$(AncmZipOutputPath)">
- <ArtifactType>ZipArchive</ArtifactType>
- <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
- <Category>shipoob</Category>
- </ArtifactInfo>
-
- <FilesToSign Include="$(AncmZipOutputPath)" IsContainer="true" />
- <FilesToSign Include="AspNetCoreModuleV1/x64/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
- <FilesToSign Include="AspNetCoreModuleV1/x86/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
- <FilesToSign Include="AspNetCoreModuleV2/x64/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
- <FilesToSign Include="AspNetCoreModuleV2/x86/aspnetcore.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
- <FilesToSign Include="AspNetCoreModuleV2/x64/aspnetcorerh.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
- <FilesToSign Include="AspNetCoreModuleV2/x86/aspnetcorerh.dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
</ItemGroup>
<Target Name="PackageNativeProjects">
@@ -93,10 +79,6 @@
<AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\ancm.mof" Link="AspNetCoreModuleV2\ancm.mof" />
</ItemGroup>
- <ZipArchive File="$(AncmZipOutputPath)"
- Overwrite="true"
- SourceFiles="@(AncmFiles)"
- WorkingDirectory="$(RepositoryRoot)" />
</Target>
</Project>
diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
deleted file mode 100644
index 51cc16d9582..00000000000
--- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-<Project>
-
- <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
- <PropertyGroup>
- <TargetFramework>netcoreapp2.1</TargetFramework>
- <PackageId>Microsoft.AspNetCore.Server.IIS</PackageId>
- <Description>Provides support for hosting ASP.NET Core in IIS using the AspNetCoreModule.</Description>
- <IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
- <IncludeSource>false</IncludeSource>
- <IncludeSymbols>false</IncludeSymbols>
- <IncludeBuildOutput>false</IncludeBuildOutput>
- <EnableApiCheck>false</EnableApiCheck>
- <NoPackageAnalysis>true</NoPackageAnalysis>
- <NuspecFile>$(PackageId).nuspec</NuspecFile>
- <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
- </PropertyGroup>
-
- <ItemGroup>
- <SignedPackageFile Include="aspnetcorerh_x86" PackagePath="runtimes/win-x86/nativeassets/$(TargetFramework)/aspnetcorerh.dll" Certificate="Microsoft" />
- <SignedPackageFile Include="aspnetcorerh_x64" PackagePath="runtimes/win-x64/nativeassets/$(TargetFramework)/aspnetcorerh.dll" Certificate="Microsoft" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
- </ItemGroup>
-
- <Target Name="SetPackageProperties" BeforeTargets="GenerateNuspec">
- <PropertyGroup>
- <NuspecProperties>
- id=$(PackageId);
- tfm=$(TargetFramework);
- tfmGroup=$(TargetFrameworkIdentifier)$(_TargetFrameworkVersionWithoutV);
- configuration=$(Configuration);
- copyright=$(Copyright);
- author=$(Authors);
- licenseUrl=$(PackageLicenseUrl);
- iconUrl=$(PackageIconUrl);
- projectUrl=$(PackageProjectUrl);
- repositoryUrl=$(RepositoryUrl);
- repositoryType=$(RepositoryType);
- repositoryCommit=$(RepositoryCommit);
- version=$(PackageVersion);
- description=$(Description);
- serviceable=$([MSBuild]::ValueOrDefault('$(Serviceable)', 'false'));
- </NuspecProperties>
- </PropertyGroup>
- </Target>
-
- <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
- <!-- This project doesn't actually compile anything. It's a shim into packing a nuspec -->
- <Target Name="Compile" />
- <Target Name="CopyFilesToOutputDirectory" />
-
-</Project>
diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec
deleted file mode 100644
index 3124aad25f6..00000000000
--- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
- <metadata>
- <id>Microsoft.AspNetCore.Server.IIS</id>
- <version>$version$</version>
- <authors>$author$</authors>
- <licenseUrl>$licenseUrl$</licenseUrl>
- <copyright>$copyright$</copyright>
- <projectUrl>$projectUrl$</projectUrl>
- <iconUrl>$iconUrl$</iconUrl>
- <requireLicenseAcceptance>true</requireLicenseAcceptance>
- <description>$description$</description>
- <language>en-US</language>
- <tags>aspnetcore iis</tags>
- <serviceable>$serviceable$</serviceable>
- <repository type="$repositoryType$" url="$repositoryUrl$" commit="$repositoryCommit$" />
- <dependencies>
- <group targetFramework="$tfmGroup$">
- <dependency id="Microsoft.AspNetCore.Server.IISIntegration" version="[$version$ , )" />
- </group>
- </dependencies>
- </metadata>
- <files>
- <!-- The _._ placeholder file will instruct NuGet to treat this package as only being compatible with $tfm$ -->
- <file src="_._" target="lib/$tfm$/" />
-
- <file src="Microsoft.AspNetCore.Server.IIS.targets" target="build/$tfm$/Microsoft.AspNetCore.Server.IIS.targets" />
-
- <file src="..\AspNetCoreModuleV2\RequestHandler\bin\$Configuration$\Win32\aspnetcorerh.dll" target="runtimes\win-x86\nativeassets\$tfm$\aspnetcorerh.dll" />
- <file src="..\AspNetCoreModuleV2\RequestHandler\bin\$Configuration$\x64\aspnetcorerh.dll" target="runtimes\win-x64\nativeassets\$tfm$\aspnetcorerh.dll" />
- </files>
-</package>
diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets
deleted file mode 100644
index fe0dbb05d58..00000000000
--- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
- <!--
- Capability that enables Visual Studio support for hosting Asp.Net Core applications in the IIS process
- -->
- <ItemGroup>
- <ProjectCapability Include="AspNetInProcessHosting" />
- </ItemGroup>
-
-</Project>
diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._
deleted file mode 100644
index e69de29bb2d..00000000000
--
GitLab