From ed132be5feef9240f5fb7681eca750d6ebea546f Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 20 May 2020 14:44:17 -0700 Subject: [PATCH 1/3] Update StaticWebAssetsIntegrationTest.cs (dotnet/aspnetcore-tooling#1923) \n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/aa8bade12ebfbd195f5d208f7fe86c380d80bdc4 --- .../test/IntegrationTests/StaticWebAssetsIntegrationTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs index 810f24b194..2491ae6e73 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs @@ -183,7 +183,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests Assert.FileDoesNotExist(result, IntermediateOutputPath, "staticwebassets", "AppWithPackageAndP2PReference.StaticWebAssets.xml"); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/22049")] [InitializeTestProject("AppWithPackageAndP2PReference", language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })] public async Task Rebuild_Success_RecreatesManifestAndCache() { From 58cc148ada2972fe93312354d06f74aa5ac87065 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 21 May 2020 11:52:32 -0700 Subject: [PATCH 2/3] Skipping flaky tests (dotnet/aspnetcore-tooling#1926) * Skipping flaky tests * Update StaticWebAssetsIntegrationTest.cs\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/beba53c682fa5b5193606647eb627c4c170464e5 --- .../test/IntegrationTests/StaticWebAssetsIntegrationTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs index 2491ae6e73..37ac8ef8ec 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/StaticWebAssetsIntegrationTest.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests public ITestOutputHelper Output { get; private set; } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/22049")] [InitializeTestProject("AppWithPackageAndP2PReference", language: "C#", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })] public async Task Build_GeneratesStaticWebAssetsManifest_Success_CreatesManifest() { @@ -125,7 +125,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests Assert.FileExists(publish, PublishOutputPath, Path.Combine("wwwroot", "_content", "PackageLibraryTransitiveDependency", "js", "pkg-transitive-dep.js")); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/22049")] [InitializeTestProject("AppWithPackageAndP2PReference", additionalProjects: new[] { "ClassLibrary", "ClassLibrary2" })] public async Task Publish_NoBuild_CopiesStaticWebAssetsToDestinationFolder() { From 297c82f7a428816dc5529e3802e231765d60c7e2 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 27 May 2020 00:27:55 -0700 Subject: [PATCH 3/3] Fix build --- .../Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj index 9b50a15c9b..5dd80f665f 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj +++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj @@ -59,6 +59,7 @@ Projects="..\..\Microsoft.AspNetCore.Mvc.Razor.Extensions\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj" Properties="TargetFramework=netstandard2.0" Targets="Build" + Condition="'$(NoBuild)' != 'true'" ContinueOnError="true" />