From 3919d18c622e7bf515e74caa78fbed42ab2eca4c Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 16 Mar 2018 10:00:23 -0700 Subject: [PATCH] React to Razor Sdk changes Assembly attributes are autogened by Razor Sdk and results in duplicates --- build/dependencies.props | 110 +++++++++--------- korebuild-lock.txt | 4 +- .../Microsoft.AspNetCore.Identity.UI.csproj | 20 +++- src/UI/Microsoft.AspNetCore.Identity.UI.props | 24 ---- .../Microsoft.AspNetCore.Identity.UI.targets | 91 --------------- 5 files changed, 73 insertions(+), 176 deletions(-) delete mode 100644 src/UI/Microsoft.AspNetCore.Identity.UI.props delete mode 100644 src/UI/Microsoft.AspNetCore.Identity.UI.targets diff --git a/build/dependencies.props b/build/dependencies.props index eab3e6dbae..5c89b25285 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,69 +4,69 @@ 0.9.9 - 2.1.0-preview2-15721 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 + 2.1.0-preview2-15742 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 2.2.1 2.3.2 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 - 2.1.0-preview2-30274 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 + 2.1.0-preview2-30355 3.14.2 5.2.0 2.0.0 - 2.1.0-preview2-26225-03 + 2.1.0-preview2-26314-02 15.6.0 3.0.1 - 2.1.0-preview2-30274 + 2.1.0-preview2-30355 4.7.49 - 4.5.0-preview2-26224-02 + 4.5.0-preview2-26313-01 0.8.0 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index e6c7fddffa..e40ef6651b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15721 -commithash:f9bb4be59e39938ec59a6975257e26099b0d03c1 +version:2.1.0-preview2-15742 +commithash:21fbb0f2c3fe4a9216e2d59632b98cfd7d685962 diff --git a/src/UI/Microsoft.AspNetCore.Identity.UI.csproj b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj index 9e3645c97b..25244e400e 100644 --- a/src/UI/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj @@ -32,17 +32,29 @@ - - <_parameter1>Microsoft.AspNetCore.Mvc.AdditionalReference <_parameter2>$(RazorTargetName).dll,false + + + <_Parameter1>$(PrecompiledDescription) + + + <_Parameter1>BuildNumber + <_Parameter2>$(BuildNumber) + + + <_Parameter1>$(NeutralLanguage) + + + + + + - - $(OutputPath)$(RazorTargetName).dll diff --git a/src/UI/Microsoft.AspNetCore.Identity.UI.props b/src/UI/Microsoft.AspNetCore.Identity.UI.props deleted file mode 100644 index cef7fa2ea5..0000000000 --- a/src/UI/Microsoft.AspNetCore.Identity.UI.props +++ /dev/null @@ -1,24 +0,0 @@ - - - true - - - - true - true - true - true - true - true - true - true - true - true - - - - - - - - \ No newline at end of file diff --git a/src/UI/Microsoft.AspNetCore.Identity.UI.targets b/src/UI/Microsoft.AspNetCore.Identity.UI.targets deleted file mode 100644 index acd6c777d4..0000000000 --- a/src/UI/Microsoft.AspNetCore.Identity.UI.targets +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - <_Parameter1>$(Company) - - - <_Parameter1>$(Configuration) - - - <_Parameter1>$(Copyright) - - - <_Parameter1>$(PrecompiledDescription) - - - <_Parameter1>$(FileVersion) - - - <_Parameter1>$(InformationalVersion) - - - <_Parameter1>$(Product) - - - <_Parameter1>$(PrecompiledAssemblyTitle) - - - <_Parameter1>$(AssemblyVersion) - - - <_Parameter1>$(NeutralLanguage) - - - <_Parameter1>BuildNumber - <_Parameter2>$(BuildNumber) - - - - - - - - $(IntermediateOutputPath)$(MSBuildProjectName).PrecompiledViews.AssemblyInfo$(DefaultLanguageSourceExtension) - $(IntermediateOutputPath)$(MSBuildProjectName).PrecompiledViews.AssemblyInfoInputs.cache - - - - - - - - - - - - - - - - - $(IntermediateOutputPath)$(MSBuildProjectName).PrecompiledViews.AssemblyInfo$(DefaultLanguageSourceExtension) - - - - - - - - - - - - - - - - \ No newline at end of file