diff --git a/IISIntegration.sln b/IISIntegration.sln index 9fea4e83..adaa8394 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 15.0.26730.03 @@ -53,6 +53,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\CommonLib\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandler", "src\RequestHandler\RequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Server.IIS", "src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj", "{46A8612B-418B-4D70-B3A7-A21DD0627473}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -198,6 +200,18 @@ Global {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 + {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|x64 + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x64.Build.0 = Debug|x64 + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.ActiveCfg = Debug|x86 + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Debug|x86.Build.0 = Debug|x86 + {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|x64 + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x64.Build.0 = Release|x64 + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.ActiveCfg = Release|x86 + {46A8612B-418B-4D70-B3A7-A21DD0627473}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -215,6 +229,7 @@ Global {4787A64F-9A3E-4867-A55A-70CB4B2B2FFE} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {55494E58-E061-4C4C-A0A8-837008E72F85} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} {D57EA297-6DC2-4BC0-8C91-334863327863} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} + {46A8612B-418B-4D70-B3A7-A21DD0627473} = {04B1EDB6-E967-4D25-89B9-E6F8304038CD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/NuGetPackageVerifier.xplat.json b/NuGetPackageVerifier.xplat.json new file mode 100644 index 00000000..c5f55829 --- /dev/null +++ b/NuGetPackageVerifier.xplat.json @@ -0,0 +1,7 @@ +{ + "Default": { + "rules": [ + "DefaultCompositeRule" + ] + } +} diff --git a/build/repo.targets b/build/repo.targets index 19c861f4..d75c4abf 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -3,6 +3,8 @@ BuildNativeAssets;$(CompileDependsOn) $(PackageDependsOn);PackageNativeProjects + + $(RepositoryRoot)NuGetPackageVerifier.xplat.json @@ -30,15 +32,8 @@ Microsoft.AspNetCore.AspNetCoreModule $(PackageVersion) $(RepositoryRoot) - - - NuGetPackage - Microsoft.AspNetCore.AspNetCoreModule.RequestHandler - $(PackageVersion) - $(RepositoryRoot) - ZipArchive @@ -78,11 +73,6 @@ Overwrite="true" SourceFiles="@(AncmFiles)" WorkingDirectory="$(RepositoryRoot)" /> - - diff --git a/nuget/AspNetCoreRequestHandler.nuspec b/nuget/AspNetCoreRequestHandler.nuspec deleted file mode 100644 index 5b1cf82d..00000000 --- a/nuget/AspNetCoreRequestHandler.nuspec +++ /dev/null @@ -1,23 +0,0 @@ - - - - Microsoft.AspNetCore.AspNetCoreModule.RequestHandler - Microsoft ASP.NET Core Module Request Handler - $VERSION$ - Microsoft - Microsoft - http://www.microsoft.com/web/webpi/eula/net_library_eula_ENU.htm - © .NET Foundation. All rights reserved. - http://www.asp.net/ - http://go.microsoft.com/fwlink/?LinkID=288859 - true - ASP.NET Core Module Request Handler - en-US - Microsoft.AspNetCore.AspNetCoreModule.RequestHandler - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj new file mode 100644 index 00000000..9625fb4c --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -0,0 +1,52 @@ + + + + + + netcoreapp2.1 + Microsoft.AspNetCore.Server.IIS + Provides support for hosting ASP.NET Core in IIS using the AspNetCoreModule. + false + false + false + false + false + true + $(PackageId).nuspec + true + + + + + + + + + + + + + + + id=$(PackageId); + tfm=$(TargetFramework); + tfmGroup=$(TargetFrameworkIdentifier)$(_TargetFrameworkVersionWithoutV); + configuration=$(Configuration); + copyright=$(Copyright); + licenseUrl=$(PackageLicenseUrl); + iconUrl=$(PackageIconUrl); + projectUrl=$(PackageProjectUrl); + repositoryUrl=$(RepositoryUrl); + version=$(PackageVersion); + description=$(Description); + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec new file mode 100644 index 00000000..30161b3c --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec @@ -0,0 +1,32 @@ + + + + Microsoft.AspNetCore.Server.IIS + $version$ + Microsoft + Microsoft + $licenseUrl$ + $copyright$ + $projectUrl$ + $iconUrl$ + true + $description$ + en-US + aspnetcore iis + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets new file mode 100644 index 00000000..2eeb8390 --- /dev/null +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets @@ -0,0 +1,14 @@ + + + + InProcess + + diff --git a/src/Microsoft.AspNetCore.Server.IIS/_._ b/src/Microsoft.AspNetCore.Server.IIS/_._ new file mode 100644 index 00000000..e69de29b