diff --git a/Directory.Build.targets b/Directory.Build.targets
index 3a01551bf0..58448682ae 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -22,10 +22,10 @@
     </ItemGroup>
 
     <ItemGroup>
-      <NativeAssemblyReferenceWithMajorVersion Include="@(NativeAssemblyReference->HasMetadata('MajorVersion'))">
+      <NativeAssemblyReferenceWithMajorVersion>
           <!-- Tensorflow has a different naming scheme for v1.14.0. Those binaries need to be copied along with the standard names -->
-          <AssemblyPathWithMajorVersion Condition="'$(OS)' != 'Windows_NT'">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity)$(LibExtension).%(NativeAssemblyReference.MajorVersion)</AssemblyPathWithMajorVersion>
-          <AssemblyPathWithMajorVersion Condition="$([MSBuild]::IsOSPlatform('osx'))">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReference.Identity).%(NativeAssemblyReference.MajorVersion)$(LibExtension)</AssemblyPathWithMajorVersion>
+          <AssemblyPathWithMajorVersion Condition="'$(OS)' != 'Windows_NT'">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReferenceWithMajorVersion.Identity)$(LibExtension).%(NativeAssemblyReferenceWithMajorVersion.MajorVersion)</AssemblyPathWithMajorVersion>
+          <AssemblyPathWithMajorVersion Condition="$([MSBuild]::IsOSPlatform('osx'))">$(NativeOutputPath)$(LibPrefix)%(NativeAssemblyReferenceWithMajorVersion.Identity).%(NativeAssemblyReferenceWithMajorVersion.MajorVersion)$(LibExtension)</AssemblyPathWithMajorVersion>
       </NativeAssemblyReferenceWithMajorVersion>
     </ItemGroup>
       
diff --git a/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj b/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj
index ad4c12fdc1..1fcfc38381 100644
--- a/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj
+++ b/src/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer/Microsoft.ML.DnnAnalyzer.csproj
@@ -13,12 +13,10 @@
 
   <!-- TensorFlow is 64-bit only -->
   <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
-    <NativeAssemblyReference Include="tensorflow">
+    <NativeAssemblyReference Include="tensorflow" />
+    <NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
       <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
-    </NativeAssemblyReference>
-    <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
-      <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
-    </NativeAssemblyReference>
+    </NativeAssemblyReferenceWithMajorVersion>
   </ItemGroup>
 
 </Project>
diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.proj b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.proj
index d310404bcb..4d8de1db3a 100644
--- a/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.proj
+++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.proj
@@ -6,25 +6,23 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <TensorFlowConfig Include="windows" FileExtension=".zip" FilesFromArchive="lib\tensorflow.dll;include\tensorflow\c\LICENSE" Runtime="win-x64"/>
-    <TensorFlowConfig Include="linux" FileExtension=".tar.gz"
+    <TensorFlowConfig Include="windows" 
+                      FileExtension=".zip" 
+                      FilesFromArchive="lib\tensorflow.dll;
+                                        include\tensorflow\c\LICENSE" 
+                      Runtime="win-x64"/>
+    <TensorFlowConfig Include="linux" 
+                      FileExtension=".tar.gz"
                       FilesFromArchive="lib\libtensorflow.so;
-                                        lib\libtensorflow.so.$(TensorFlowMajorVersion);
-                                        lib\libtensorflow.so.$(TensorFlowVersion);
-                                        lib\libtensorflow_framework.so;
                                         lib\libtensorflow_framework.so.$(TensorFlowMajorVersion);
-                                        lib\libtensorflow_framework.so.$(TensorFlowVersion);
                                         include\tensorflow\c\LICENSE"
-                    Runtime="linux-x64" />
-    <TensorFlowConfig Include="darwin" FileExtension=".tar.gz"
+                      Runtime="linux-x64" />
+    <TensorFlowConfig Include="darwin" 
+                      FileExtension=".tar.gz"
                       FilesFromArchive="lib\libtensorflow.dylib;
-                                        lib\libtensorflow.$(TensorFlowMajorVersion).dylib;
-                                        lib\libtensorflow.$(TensorFlowVersion).dylib;
-                                        lib\libtensorflow_framework.dylib;
                                         lib\libtensorflow_framework.$(TensorFlowMajorVersion).dylib;
-                                        lib\libtensorflow_framework.$(TensorFlowVersion).dylib;
                                         include\tensorflow\c\LICENSE"
-                        Runtime="osx-x64" />
+                      Runtime="osx-x64" />
 
 
       <AdditionalDownloadFile Include="https://raw.githubusercontent.com/tensorflow/tensorflow/master/LICENSE" DownloadFile="$(IntermediateOutputPath)LICENSE" />
diff --git a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
index deb41b5c4a..e514000470 100644
--- a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
+++ b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj
@@ -38,12 +38,10 @@
 
   <!-- TensorFlow is 64-bit only -->
   <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
-    <NativeAssemblyReference Include="tensorflow">
+    <NativeAssemblyReference Include="tensorflow" />
+    <NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
       <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
-    </NativeAssemblyReference>
-    <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
-      <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
-    </NativeAssemblyReference>
+    </NativeAssemblyReferenceWithMajorVersion>
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj b/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj
index abb06dcc4a..ef3f8517fa 100644
--- a/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj
+++ b/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj
@@ -44,12 +44,10 @@
 
   <!-- TensorFlow is 64-bit only -->
   <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
-    <NativeAssemblyReference Include="tensorflow">
+    <NativeAssemblyReference Include="tensorflow" />
+    <NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
       <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
-    </NativeAssemblyReference>
-    <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
-      <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
-    </NativeAssemblyReference>
+    </NativeAssemblyReferenceWithMajorVersion>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.ML.TensorFlow.TestModels" Version="$(MicrosoftMLTensorFlowTestModelsVersion)" />
diff --git a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
index c499c63a34..7f257530c1 100644
--- a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
+++ b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
@@ -45,12 +45,10 @@
 
   <!-- TensorFlow is 64-bit only -->
   <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64'">
-    <NativeAssemblyReference Include="tensorflow">
+    <NativeAssemblyReference Include="tensorflow" />
+    <NativeAssemblyReferenceWithMajorVersion Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
       <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
-    </NativeAssemblyReference>
-    <NativeAssemblyReference Condition="'$(OS)' != 'Windows_NT'" Include="tensorflow_framework">
-      <MajorVersion>$(TensorFlowMajorVersion)</MajorVersion>
-    </NativeAssemblyReference>
+    </NativeAssemblyReferenceWithMajorVersion>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.ML.TensorFlow.TestModels" Version="$(MicrosoftMLTensorFlowTestModelsVersion)" />