From 55e0fd5677f35e821edcd4822352f2addb1c113a Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Mon, 2 Jul 2018 17:02:30 -0700
Subject: [PATCH] Fix the version override check for ProdCon builds

---
 build/dependencies.props                          | 1 -
 test/SharedFx.UnitTests/SharedFx.UnitTests.csproj | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index f0587a1537..bbc2910674 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -11,7 +11,6 @@
   <PropertyGroup>
     <!-- Assign this variable last because it may be updated from DotNetPackageVersionPropsPath as MicrosoftNETCoreAppPackageVersion. -->
     <MicrosoftNETCoreApp21PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETCoreAppPackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' == ''">$(MicrosoftNETCoreApp21PackageVersion)</MicrosoftNETCoreAppPackageVersion>
 
     <!-- Determined by build tools -->
     <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
diff --git a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
index 31a39f032c..e574f7d305 100644
--- a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
+++ b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
@@ -24,7 +24,7 @@
     </AssemblyAttribute>
     <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
       <_Parameter1>MicrosoftNETCoreAppPackageVersion</_Parameter1>
-      <_Parameter2>$(MicrosoftNETCoreAppPackageVersion)</_Parameter2>
+      <_Parameter2>$(RuntimeFrameworkVersion)</_Parameter2>
     </AssemblyAttribute>
   </ItemGroup>