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

Fix dotnet publish issues with aspnetcorerh.dll (#835)

This commit is contained in:
Justin Kotalik 2018-05-15 18:10:57 -07:00 committed by GitHub
parent 34c797a46b
commit e9b8bf085d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -14,7 +14,7 @@
<MicrosoftAspNetCoreHttpOverridesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreHttpOverridesPackageVersion> <MicrosoftAspNetCoreHttpOverridesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreHttpOverridesPackageVersion>
<MicrosoftAspNetCoreHttpPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreHttpPackageVersion> <MicrosoftAspNetCoreHttpPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreHttpPackageVersion>
<MicrosoftAspNetCoreHttpSysSourcesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreHttpSysSourcesPackageVersion> <MicrosoftAspNetCoreHttpSysSourcesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreHttpSysSourcesPackageVersion>
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-preview1-34184</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion> <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-a-preview1-portableFlag-17022</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreServerKestrelPackageVersion> <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreServerKestrelPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreTestHostPackageVersion> <MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreTestingPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreTestingPackageVersion>

8
build/testsite.props
View File

@ -31,10 +31,10 @@
<ItemGroup Condition="'$(OS)' == 'Windows_NT'"> <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\$(NativeFolder)\aspnetcorerh.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\$(NativeFolder)\aspnetcorerh.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\$(NativeFolder)\aspnetcorerh.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\$(NativeFolder)\aspnetcorerh.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcorev2.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(NativePlatform)\%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcorev2.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcorev2.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(NativePlatform)\%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcorev2.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcore.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(NativePlatform)\%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcore.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" />
<None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcore.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(NativePlatform)\%(FileName)%(Extension)" /> <None Include="$(MSBuildThisFileDirectory)..\src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\$(NativeFolder)\aspnetcore.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="$(BasePathForRequestHandler)%(FileName)%(Extension)" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>

2
test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs
View File

@ -106,11 +106,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
var logger = loggerFactory.CreateLogger("HelloWorldTest"); var logger = loggerFactory.CreateLogger("HelloWorldTest");
var deploymentParameters = GetBaseDeploymentParameters(); var deploymentParameters = GetBaseDeploymentParameters();
deploymentParameters.ApplicationType = ApplicationType.Standalone;
using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory))
{ {
var deploymentResult = await deployer.DeployAsync(); var deploymentResult = await deployer.DeployAsync();
deploymentParameters.ApplicationType = ApplicationType.Standalone;
// Request to base address and check if various parts of the body are rendered & measure the cold startup time. // Request to base address and check if various parts of the body are rendered & measure the cold startup time.
var response = await RetryHelper.RetryRequest(() => var response = await RetryHelper.RetryRequest(() =>

10
test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
View File

@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{ {
} }
[Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] [Theory]
[InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModule)]
[InlineData(ANCMVersion.AspNetCoreModuleV2)] [InlineData(ANCMVersion.AspNetCoreModuleV2)]
public Task HelloWorld_IISExpress_Clr_X64_Portable(ANCMVersion ancmVersion) public Task HelloWorld_IISExpress_Clr_X64_Portable(ANCMVersion ancmVersion)
@ -35,6 +35,14 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, ancmVersion); return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, ancmVersion);
} }
[Theory]
[InlineData(ANCMVersion.AspNetCoreModule)]
[InlineData(ANCMVersion.AspNetCoreModuleV2)]
public Task HelloWorld_IISExpress_CoreClr_X64_Standalone(ANCMVersion ancmVersion)
{
return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Standalone, ancmVersion);
}
private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, ANCMVersion ancmVersion) private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType, ANCMVersion ancmVersion)
{ {
var serverType = ServerType.IISExpress; var serverType = ServerType.IISExpress;

4
test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
View File

@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{ {
} }
[Theory(Skip = "Full framework web.config generation is currently incorrect. See: https://github.com/aspnet/websdk/pull/322")] [Theory]
[InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModule)]
[InlineData(ANCMVersion.AspNetCoreModuleV2)] [InlineData(ANCMVersion.AspNetCoreModuleV2)]
public Task Https_HelloWorld_CLR_X64(ANCMVersion ancmVersion) public Task Https_HelloWorld_CLR_X64(ANCMVersion ancmVersion)
@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44397, sendClientCert: false, ancmVersion); return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44397, sendClientCert: false, ancmVersion);
} }
[Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] [Theory]
[InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModule)]
[InlineData(ANCMVersion.AspNetCoreModuleV2)] [InlineData(ANCMVersion.AspNetCoreModuleV2)]
public Task Https_HelloWorld_NoClientCert_Clr_X64(ANCMVersion ancmVersion) public Task Https_HelloWorld_NoClientCert_Clr_X64(ANCMVersion ancmVersion)

2
test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
View File

@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{ {
} }
[Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] [Theory]
[InlineData(ANCMVersion.AspNetCoreModule)] [InlineData(ANCMVersion.AspNetCoreModule)]
[InlineData(ANCMVersion.AspNetCoreModuleV2)] [InlineData(ANCMVersion.AspNetCoreModuleV2)]
public Task NtlmAuthentication_Clr_X64(ANCMVersion ancmVersion) public Task NtlmAuthentication_Clr_X64(ANCMVersion ancmVersion)

6
test/TestTasks/InjectRequestHandler.cs
View File

@ -14,9 +14,9 @@ namespace TestTasks
{ {
private static void Main(string[] args) private static void Main(string[] args)
{ {
var depsFile = args[2]; string rid = args[0];
var rid = args[0]; string libraryLocation = args[1];
var libraryLocation = args[1]; string depsFile = args[2];
JToken deps; JToken deps;
using (var file = File.OpenText(depsFile)) using (var file = File.OpenText(depsFile))