From 4acdebc5be6f204bec935e8fdbc1dc8c50d4e84b Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Mon, 12 Mar 2018 13:29:49 -0700 Subject: [PATCH] Temporary workaround issue with Sdk mismatch (#7472) --- build/dependencies.props | 130 +++++++++--------- korebuild-lock.txt | 4 +- .../RelatedAssemblyAttribute.cs | 4 +- 3 files changed, 70 insertions(+), 68 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 911a48f68e..33a9e96054 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,77 +4,77 @@ 0.10.11 - 2.1.0-preview2-15733 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 + 2.1.0-preview2-15736 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 5.2.4 2.6.1 2.6.1 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 2.1.0-preview2-26308-02 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 - 2.1.0-preview2-30281 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 + 2.1.0-preview2-30285 2.0.0 2.1.0-preview2-26308-01 - 2.1.0-preview2-30281 + 2.1.0-preview2-30285 15.6.0 4.7.49 1.0.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 7e595b2958..688fd7ad19 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15732 -commithash:f65b527f19fa0ef31a8e0e0e0ee2783e8268e091 +version:2.1.0-preview2-15736 +commithash:36ec5cebaad48f278fd9420fe459d7d0640ec80f diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs b/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs index 344c39542f..153cbfcbe2 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs @@ -13,7 +13,9 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts { if (string.IsNullOrEmpty(name)) { - throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(name)); + // Temporary workaround until we have a new build of RazorSdk. + // TODO: Uncomment the below line. + // throw new ArgumentException(Resources.ArgumentCannotBeNullOrEmpty, nameof(name)); } }