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

[automated] Merge branch 'release/2.2' => 'master' (#5892)

This commit is contained in:
dotnet-maestro-bot 2018-12-18 19:43:32 -08:00 committed by Justin Kotalik
parent ffec555118
commit 7b77332441
11 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/dependencies.props
View File

@ -149,6 +149,7 @@
<MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>
<MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>
<MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion>
<MicrosoftAspNetCoreServerIISStablePackageVersion>2.2.0</MicrosoftAspNetCoreServerIISStablePackageVersion>
<MicrosoftAspNetWebApiClientPackageVersion>5.2.6</MicrosoftAspNetWebApiClientPackageVersion>
<MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>
<MicrosoftAzureManagementFluentPackageVersion>1.1.3</MicrosoftAzureManagementFluentPackageVersion>

2
src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
View File

@ -51,4 +51,4 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
<PackageReference Include="Microsoft.Extensions.ValueStopwatch.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsValueStopwatchSourcesPackageVersion)" />
</ItemGroup>
</Project>
</Project>

6
src/Servers/IIS/ResolveIisReferences.targets
View File

@ -16,7 +16,7 @@ with the right MSBuild incantations to get output copied to the right place.
<ItemGroup Condition=" '@(Reference->AnyHaveMetadataValue('Identity', 'AspNetCoreModuleV2'))' == 'true' ">
<Reference Remove="AspNetCoreModuleV2" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)src\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" />
</ItemGroup>
@ -26,7 +26,7 @@ with the right MSBuild incantations to get output copied to the right place.
<!-- Set the arch-->
<SetPlatform>Platform=x64</SetPlatform>
<!-- The base path for the output. -->
<LinkBase>x64\</LinkBase>
<LinkBase>x64\%(HandlerPath)\</LinkBase>
<!-- This reference assembly doesn't need -->
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<!-- NativeContent is a custom type of item group which is assigned a target path after project references are resolved. -->
@ -48,7 +48,7 @@ with the right MSBuild incantations to get output copied to the right place.
<!-- Set the arch-->
<SetPlatform>Platform=x86</SetPlatform>
<!-- The base path for the output. -->
<LinkBase>x86\</LinkBase>
<LinkBase>x86\%(HandlerPath)\</LinkBase>
<!-- This reference assembly doesn't need -->
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<!-- NativeContent is a custom type of item group which is assigned a target path after project references are resolved. -->

11
src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
View File

@ -19,9 +19,16 @@
<Content Include="$(PackageId).targets" PackagePath="build/$(TargetFramework)/" />
</ItemGroup>
<Target Name="ValidateNativeComponentsBuilt" AfterTargets="Build" >
<Error Text="Required dll from ANCM has not been built. To build ANCM, you must use MSBuild.exe."
Condition="'$(OS)' == 'Windows_NT' AND !Exists('$(AspNetCoreModuleV2InProcessHandlerDll)')" />
</Target>
<ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''">
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="AspNetCoreModule" Condition="'$(OS)' == 'Windows_NT'" />
<Reference Include="AspNetCoreModuleV2" Condition="'$(OS)' == 'Windows_NT'" />
<Reference Include="Microsoft.AspNetCore.Authentication.Core" />
<Reference Include="Microsoft.AspNetCore.Connections.Abstractions" />
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />

15
src/Servers/IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
View File

@ -13,10 +13,25 @@
<IsPackable>true</IsPackable>
</PropertyGroup>
<Import Project="..\..\build\assets.props" />
<ItemGroup>
<EmbeddedResource Include="Http.config" />
</ItemGroup>
<Target Name="ValidateNativeComponentsBuilt" AfterTargets="Build" Condition="'$(OS)' == 'Windows_NT'">
<Error Text="Required dll from ANCM has not been built. To build ANCM, you must use MSBuild.exe."
Condition="!Exists('$(AspNetCoreModuleV1ShimDll)')
OR !Exists('$(AspNetCoreModuleV2ShimDll)')
OR !Exists('$(AspNetCoreModuleV2OutOfProcessHandlerDll)')" />
</Target>
<ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''">
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Server.IntegrationTesting" />
<Reference Include="Microsoft.NETCore.Windows.ApiSets" />

2
src/Servers/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs
View File

@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
}
public IISTestSiteFixture(Action<IISDeploymentParameters> configure)
internal IISTestSiteFixture(Action<IISDeploymentParameters> configure)
{
var logging = AssemblyTestLog.ForAssembly(typeof(IISTestSiteFixture).Assembly);
_loggerFactory = logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture));

2
src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/BackwardsCompatibilityTests.cs
View File

@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
if (handle.ModuleName == "aspnetcorev2.dll")
{
Assert.Equal("12.2.18287.0", handle.FileVersionInfo.FileVersion);
Assert.Equal("12.2.18316.0", handle.FileVersionInfo.FileVersion);
return;
}
}

2
src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/ForwardsCompatibilityTests.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
if (handle.ModuleName == "aspnetcorev2_inprocess.dll")
{
Assert.Equal("12.2.18287.0", handle.FileVersionInfo.FileVersion);
Assert.Equal("12.2.18316.0", handle.FileVersionInfo.FileVersion);
return;
}
}

3
src/Servers/IIS/test/IIS.Tests/Utilities/TestServer.cs
View File

@ -31,7 +31,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
private const string HWebCoreDll = "hwebcore.dll";
internal static string HostableWebCoreLocation => Environment.ExpandEnvironmentVariables($@"%windir%\system32\inetsrv\{HWebCoreDll}");
internal static string BasePath => Path.GetDirectoryName(new Uri(typeof(TestServer).Assembly.CodeBase).AbsolutePath);
internal static string BasePath => Path.Combine(Path.GetDirectoryName(new Uri(typeof(TestServer).Assembly.CodeBase).AbsolutePath),
Environment.Is64BitProcess ? "x64" : "x86");
internal static string AspNetCoreModuleLocation => Path.Combine(BasePath, AspNetCoreModuleDll);

2
src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>

2
src/Servers/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj
View File

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Server.IIS" />
<PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="$(MicrosoftAspNetCoreServerIISStablePackageVersion)" />
<Reference Include="Microsoft.AspNetCore.ResponseCompression" />
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />