From e98d94a1ec53aa1abfc5a8b38e553310b53b1dc7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 27 Sep 2018 10:44:42 -0700 Subject: [PATCH 1/5] Updating submodule(s) EntityFrameworkCore => cd6c3462e5b551416f58afcb22f5f094ff236a03 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 7c60f309fa..cd6c3462e5 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 7c60f309fadbd3143b485fda307a1dae53ff86c9 +Subproject commit cd6c3462e5b551416f58afcb22f5f094ff236a03 From f64716d5d4e41c23f2559c715ddb76deeb15260a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 27 Sep 2018 18:18:27 +0000 Subject: [PATCH 2/5] Updating submodule(s) Scaffolding => b7bda7875e69ed66f6c4d62e6dc33bd39c73b7a4 [auto-updated: submodules] --- modules/Scaffolding | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Scaffolding b/modules/Scaffolding index de6434aa77..b7bda7875e 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit de6434aa771605d944428ab59766fd9f8c999e58 +Subproject commit b7bda7875e69ed66f6c4d62e6dc33bd39c73b7a4 From ff5ca47539c506805a828ad1c75a934772d078fd Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 27 Sep 2018 18:51:04 +0000 Subject: [PATCH 3/5] Updating submodule(s) SignalR => 870efd59657d98b4b8ee8dadfdf687aa12c4d41f [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 3c8c8ba333..870efd5965 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 3c8c8ba333e2c5e4b9cc2c205e01731c9e1ddfe0 +Subproject commit 870efd59657d98b4b8ee8dadfdf687aa12c4d41f From e8d332102576a689fc95e822847caeffa0a726c2 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Thu, 27 Sep 2018 12:17:14 -0700 Subject: [PATCH 4/5] Add AdditionalRestoreSources parameter to Cli.FunctionalTests (#1429) - Required for builds which need to restore from multiple feeds --- .azure/pipelines/e2e-tests.yml | 4 ++-- test/Cli.FunctionalTests/Cli.FunctionalTests.csproj | 1 - test/Cli.FunctionalTests/Cli.FunctionalTests.sln | 2 +- test/Cli.FunctionalTests/NuGetPackageSource.cs | 5 ++++- test/Cli.FunctionalTests/run-tests.ps1 | 11 +++++++++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.azure/pipelines/e2e-tests.yml b/.azure/pipelines/e2e-tests.yml index 6019a47184..528dfd6929 100644 --- a/.azure/pipelines/e2e-tests.yml +++ b/.azure/pipelines/e2e-tests.yml @@ -19,7 +19,7 @@ phases: inputs: versionSpec: 10.x - powershell: | - test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) + test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES condition: ne(variables['PB_SkipTests'], 'true') displayName: Run E2E tests - task: PublishTestResults@2 @@ -47,7 +47,7 @@ phases: inputs: versionSpec: 8.x - powershell: | - test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) + test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES condition: ne(variables['PB_SkipTests'], 'true') displayName: Run E2E tests - task: PublishTestResults@2 diff --git a/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj b/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj index 385a9dde2a..b2227fad1e 100644 --- a/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj +++ b/test/Cli.FunctionalTests/Cli.FunctionalTests.csproj @@ -6,7 +6,6 @@ latest https://api.nuget.org/v3/index.json; - $(DotNetRestoreSources) diff --git a/test/Cli.FunctionalTests/Cli.FunctionalTests.sln b/test/Cli.FunctionalTests/Cli.FunctionalTests.sln index 42f7f90f69..82d40614d1 100644 --- a/test/Cli.FunctionalTests/Cli.FunctionalTests.sln +++ b/test/Cli.FunctionalTests/Cli.FunctionalTests.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cli.FunctionalTests", "Cli. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EC88B4E-B1F2-4183-9EBF-BF66C45D19D7}" ProjectSection(SolutionItems) = preProject - ..\..\.vsts\builds\e2e-tests.yml = ..\..\.vsts\builds\e2e-tests.yml + ..\..\.azure\pipelines\e2e-tests.yml = ..\..\.azure\pipelines\e2e-tests.yml EndProjectSection EndProject Global diff --git a/test/Cli.FunctionalTests/NuGetPackageSource.cs b/test/Cli.FunctionalTests/NuGetPackageSource.cs index 30545f8ca5..e1bbce195a 100644 --- a/test/Cli.FunctionalTests/NuGetPackageSource.cs +++ b/test/Cli.FunctionalTests/NuGetPackageSource.cs @@ -51,7 +51,10 @@ namespace Cli.FunctionalTests var sourceString = Environment.GetEnvironmentVariable("NUGET_PACKAGE_SOURCE") ?? throw new InvalidOperationException("Environment variable NUGET_PACKAGE_SOURCE is required but not set"); - return string.Join(" ", sourceString.Split(',').Select(s => $"--source {s}")); + // Split on pipe and remove blank entries + var sources = sourceString.Split('|').Where(s => !string.IsNullOrWhiteSpace(s)); + + return string.Join(" ", sources.Select(s => $"--source {s}")); } } } diff --git a/test/Cli.FunctionalTests/run-tests.ps1 b/test/Cli.FunctionalTests/run-tests.ps1 index 76fc8ec77b..e21ee72334 100644 --- a/test/Cli.FunctionalTests/run-tests.ps1 +++ b/test/Cli.FunctionalTests/run-tests.ps1 @@ -29,6 +29,9 @@ The prodcon build.xml file .PARAMETER ProdConChannel The prodcon channel to use if a build.xml file isn't set. + +.PARAMETER AdditionalRestoreSources +A pipe-separated list of extra NuGet feeds. Required for builds which need to restore from multiple feeds. #> param( @@ -40,7 +43,8 @@ param( $TestRuntimeIdentifier, $HostRid, $ProdConManifestUrl, - $ProdConChannel = 'release/2.1' + $ProdConChannel = 'release/2.1', + $AdditionalRestoreSources ) $ErrorActionPreference = 'Stop' @@ -117,6 +121,10 @@ try { $sdkVersion = $cli.Build.ProductVersion } + if ($AdditionalRestoreSources) { + $RestoreSources += "|$AdditionalRestoreSources" + } + Write-Host "sdkVersion: $sdkVersion" Write-Host "AssetRootUrl: $AssetRootUrl" Write-Host "RestoreSources: $RestoreSources" @@ -160,7 +168,6 @@ try { Invoke-Block { & $dotnet test ` --logger "console;verbosity=detailed" ` --logger "trx;LogFileName=$repoRoot/artifacts/logs/e2etests.trx" ` - "-p:DotNetRestoreSources=$RestoreSources" ` "-bl:$repoRoot/artifacts/logs/e2etests.binlog" ` @filterArgs } } From c9747bcf6b69d7038b7e06e13406514bb916e9cf Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 27 Sep 2018 12:58:41 -0700 Subject: [PATCH 5/5] Use Microsoft400 for code signing CAB, MSI, and installer bundles (#1433) --- eng/targets/Wix.Common.targets | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets index 20da24a175..4b07606e19 100644 --- a/eng/targets/Wix.Common.targets +++ b/eng/targets/Wix.Common.targets @@ -2,10 +2,19 @@ + + + Microsoft400 + - Microsoft400 + + Microsoft400 + + + Microsoft400 +