From 80fec4e3edea3972e95885f5c0db6ee06072f917 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Nov 2019 02:10:15 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191104.8 - Microsoft.EntityFrameworkCore.Tools - 3.1.0-preview3.19554.8 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.0-preview3.19554.8 - dotnet-ef - 3.1.0-preview3.19554.8 - Microsoft.EntityFrameworkCore - 3.1.0-preview3.19554.8 - Microsoft.EntityFrameworkCore.InMemory - 3.1.0-preview3.19554.8 - Microsoft.EntityFrameworkCore.Relational - 3.1.0-preview3.19554.8 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.0-preview3.19554.8 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ab144764a..54509fa033 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling 542a22f0b0242fc7247884b316c71e921d9711da - + https://github.com/aspnet/EntityFrameworkCore - b7ef9ec472b2d25cca70e3c9b4ab3a1032d275d5 + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - b7ef9ec472b2d25cca70e3c9b4ab3a1032d275d5 + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - b7ef9ec472b2d25cca70e3c9b4ab3a1032d275d5 + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - b7ef9ec472b2d25cca70e3c9b4ab3a1032d275d5 + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - b7ef9ec472b2d25cca70e3c9b4ab3a1032d275d5 + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - b7ef9ec472b2d25cca70e3c9b4ab3a1032d275d5 + 3442750627d3532f4e44f21df91f7fbe9315e59a - + https://github.com/aspnet/EntityFrameworkCore - b7ef9ec472b2d25cca70e3c9b4ab3a1032d275d5 + 3442750627d3532f4e44f21df91f7fbe9315e59a https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index 7c1a0d255e..fd988d11b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -160,13 +160,13 @@ 3.1.0-preview3.19553.2 3.1.0-preview3.19553.2 - 3.1.0-preview3.19554.3 - 3.1.0-preview3.19554.3 - 3.1.0-preview3.19554.3 - 3.1.0-preview3.19554.3 - 3.1.0-preview3.19554.3 - 3.1.0-preview3.19554.3 - 3.1.0-preview3.19554.3 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 + 3.1.0-preview3.19554.8 3.1.0-preview3.19553.1 3.1.0-preview3.19553.1 From 5195d15939d44eeef809c3ece51e5e8332034260 Mon Sep 17 00:00:00 2001 From: Kevin Pilch Date: Tue, 5 Nov 2019 11:24:48 -0800 Subject: [PATCH 2/5] Update some tests --- .../testassets/BasicTestApp/ErrorComponent.razor | 2 +- .../JsonPatch/test/Internal/ObjectVisitorTest.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Components/test/testassets/BasicTestApp/ErrorComponent.razor b/src/Components/test/testassets/BasicTestApp/ErrorComponent.razor index 369db93db0..62855e8935 100644 --- a/src/Components/test/testassets/BasicTestApp/ErrorComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/ErrorComponent.razor @@ -11,6 +11,6 @@ void IncrementCount() { currentCount++; - throw new NotImplementedException("Doing crazy things!"); + throw new NotImplementedException("Doing something that won't work!"); } } diff --git a/src/Features/JsonPatch/test/Internal/ObjectVisitorTest.cs b/src/Features/JsonPatch/test/Internal/ObjectVisitorTest.cs index 44f6fc81ae..5a936bebdc 100644 --- a/src/Features/JsonPatch/test/Internal/ObjectVisitorTest.cs +++ b/src/Features/JsonPatch/test/Internal/ObjectVisitorTest.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal { public string Name { get; set; } public IList States { get; set; } = new List(); - public IDictionary Countries = new Dictionary(); + public IDictionary CountriesAndRegions = new Dictionary(); public dynamic Items { get; set; } = new ExpandoObject(); } @@ -62,14 +62,14 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal get { var model = new Class1(); - yield return new object[] { model, "/Countries/USA", model.Countries }; - yield return new object[] { model.Countries, "/USA", model.Countries }; + yield return new object[] { model, "/CountriesAndRegions/USA", model.CountriesAndRegions }; + yield return new object[] { model.CountriesAndRegions, "/USA", model.CountriesAndRegions }; var nestedModel = new Class1Nested(); nestedModel.Customers.Add(new Class1()); - yield return new object[] { nestedModel, "/Customers/0/Countries/USA", nestedModel.Customers[0].Countries }; - yield return new object[] { nestedModel.Customers, "/0/Countries/USA", nestedModel.Customers[0].Countries }; - yield return new object[] { nestedModel.Customers[0], "/Countries/USA", nestedModel.Customers[0].Countries }; + yield return new object[] { nestedModel, "/Customers/0/CountriesAndRegions/USA", nestedModel.Customers[0].CountriesAndRegions }; + yield return new object[] { nestedModel.Customers, "/0/CountriesAndRegions/USA", nestedModel.Customers[0].CountriesAndRegions }; + yield return new object[] { nestedModel.Customers[0], "/CountriesAndRegions/USA", nestedModel.Customers[0].CountriesAndRegions }; } } From 5171fd2bb51965c5ebf5713c7ec5e654164ff307 Mon Sep 17 00:00:00 2001 From: Artak <34246760+mkArtakMSFT@users.noreply.github.com> Date: Thu, 7 Nov 2019 12:35:12 -0800 Subject: [PATCH 3/5] Disable webpack build progress reporting for Angular projects Addresses https://github.com/aspnet/AspNetCore-ManualTests/issues/43 --- .../content/Angular-CSharp/ClientApp/angular.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json index ce5929d3f1..4d2c7b9fad 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json @@ -13,7 +13,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "progress": true, + "progress": false, "extractCss": true, "outputPath": "dist", "index": "src/index.html", From 43feff098bc5252d8581de1b9b1b88d375ac34f7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 7 Nov 2019 16:28:50 -0800 Subject: [PATCH 4/5] Disable SDL, increase timeout to 4.5 hours --- .azure/pipelines/ci.yml | 2 +- .azure/pipelines/jobs/default-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 835b8bf0ef..0418caefef 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -639,7 +639,7 @@ stages: publishInstallersAndChecksums: true # This is to enable SDL runs part of Post-Build Validation Stage SDLValidationParameters: - enable: true + enable: false continueOnError: false params: ' -SourceToolsList @("policheck","credscan") -TsaInstanceURL $(_TsaInstanceURL) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index d218c44531..18efdb3783 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -58,7 +58,7 @@ parameters: installTar: true installNodeJs: true installJdk: true - timeoutInMinutes: 180 + timeoutInMinutes: 270 # We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case). # This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build From 77afd21e90b1e65ab2e9e63060b0d6b70412d4f4 Mon Sep 17 00:00:00 2001 From: Brennan Date: Sat, 9 Nov 2019 17:00:10 -0800 Subject: [PATCH 5/5] Change how we resolve dotnet in tests (#16934) --- src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs | 7 ++++++- src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs b/src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs index da77434c8d..6d89b4861a 100644 --- a/src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs +++ b/src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; using System.Runtime.CompilerServices; using System.Threading.Tasks; using Microsoft.Extensions.CommandLineUtils; @@ -88,15 +89,19 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests }; args.AddRange(arguments); + var dotnetPath = typeof(WatchableApp).Assembly.GetCustomAttributes() + .Single(s => s.Key == "DotnetPath").Value; + var spec = new ProcessSpec { - Executable = DotNetMuxer.MuxerPathOrDefault(), + Executable = dotnetPath, Arguments = args, WorkingDirectory = SourceDirectory, EnvironmentVariables = { ["DOTNET_CLI_CONTEXT_VERBOSE"] = bool.TrueString, ["DOTNET_USE_POLLING_FILE_WATCHER"] = UsePollingWatcher.ToString(), + ["DOTNET_ROOT"] = Directory.GetParent(dotnetPath).FullName, }, }; diff --git a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj index 2bf2ed51d1..219f55d6f4 100644 --- a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj +++ b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj @@ -17,6 +17,13 @@ + + + <_Parameter1>DotnetPath + <_Parameter2>$(DotNetTool) + + +