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

Upgrade build tools to use the 2.1.400 SDK (#1249)

This commit is contained in:
Nate McMaster 2018-08-17 15:23:18 -07:00 committed by Justin Kotalik
parent 5fc59b2331
commit 84d4627b8b
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -18,6 +18,8 @@
<PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName> <PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!-- Workaround microsoft/msbuild#3626 -->
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.2.0-preview1-20180807.2 version:2.2.0-preview1-20180816.6
commithash:11495dbd236104434e08cb1152fcb58cf2a20923 commithash:226c8adaefd0d19db0d9d11d911ba7d95644b224

6
src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployerBase.cs
View File

@ -100,7 +100,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
private void AddWebConfigEnvironmentVariables(XElement element, string contentRoot) private void AddWebConfigEnvironmentVariables(XElement element, string contentRoot)
{ {
var environmentVariables = element var environmentVariables = element
.RequiredElement("system.webServer") .Descendants("system.webServer")
.Single()
.RequiredElement("aspNetCore") .RequiredElement("aspNetCore")
.GetOrAdd("environmentVariables"); .GetOrAdd("environmentVariables");
@ -114,7 +115,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
private void AddHandlerSettings(XElement element, string contentRoot) private void AddHandlerSettings(XElement element, string contentRoot)
{ {
var handlerSettings = element var handlerSettings = element
.RequiredElement("system.webServer") .Descendants("system.webServer")
.Single()
.RequiredElement("aspNetCore") .RequiredElement("aspNetCore")
.GetOrAdd("handlerSettings"); .GetOrAdd("handlerSettings");

7
src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/WebConfigHelpers.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Linq;
using System.Xml.Linq; using System.Xml.Linq;
namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
@ -12,7 +13,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
{ {
return (element, _) => { return (element, _) => {
element element
.GetOrAdd("system.webServer") .Descendants("system.webServer")
.Single()
.GetOrAdd("aspNetCore") .GetOrAdd("aspNetCore")
.SetAttributeValue(key, value); .SetAttributeValue(key, value);
}; };
@ -23,7 +25,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
return (element, _) => return (element, _) =>
{ {
element element
.GetOrAdd("system.webServer") .Descendants("system.webServer")
.Single()
.GetOrAdd("handlers") .GetOrAdd("handlers")
.GetOrAdd("add") .GetOrAdd("add")
.SetAttributeValue(key, value); .SetAttributeValue(key, value);

4
test/Common.FunctionalTests/MultiApplicationTests.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq; using System.Xml.Linq;
using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
@ -78,7 +79,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
var webConfigLocation = GetWebConfigLocation(directory); var webConfigLocation = GetWebConfigLocation(directory);
XDocument webConfig = XDocument.Load(webConfigLocation); XDocument webConfig = XDocument.Load(webConfigLocation);
webConfig.Root webConfig.Root
.GetOrAdd("system.webServer") .Descendants("system.webServer")
.Single()
.GetOrAdd("aspNetCore") .GetOrAdd("aspNetCore")
.SetAttributeValue("hostingModel", model.ToString()); .SetAttributeValue("hostingModel", model.ToString());
webConfig.Save(webConfigLocation); webConfig.Save(webConfigLocation);