Bläddra i källkod

Fix the version override check for ProdCon builds

Nate McMaster 7 år sedan
förälder
incheckning
55e0fd5677
2 ändrade filer med 1 tillägg och 2 borttagningar
  1. 0 1
      build/dependencies.props
  2. 1 1
      test/SharedFx.UnitTests/SharedFx.UnitTests.csproj

+ 0 - 1
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>

+ 1 - 1
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>