Apply dependency version downgrade from 0097e40 in .csproj world

Question: Should Microsoft.Extensions.DependencyModel dependency really be 1.1.0?
aspnet · Feb 26, 2017 · a51f2ee · a51f2ee
1 parent daac4be
commit a51f2ee
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
@@ -22,8 +22,8 @@ Microsoft.AspNetCore.Mvc.IActionResult</Description>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.0-*" />
-    <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.4.0-*" />
+    <PackageReference Include="Microsoft.CSharp" Version="$(CoreFxVersion)-*" />
+    <PackageReference Include="System.ComponentModel.TypeConverter" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
@@ -28,16 +28,16 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
     <PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="1.2.0-*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="1.2.0-*" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0-*" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="1.2.0-*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.PropertyActivator.Sources" Version="1.2.0-*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.SecurityHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
-    <PackageReference Include="System.Buffers" Version="4.4.0-*" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.4.0-*" />
+    <PackageReference Include="System.Buffers" Version="$(CoreFxVersion)-*" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="1.2.0-*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="1.2.0-*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="1.2.0-*" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0-*" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
@@ -15,8 +15,8 @@
 
     <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="1.2.0-*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
-    <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.4.0-*" />
-    <PackageReference Include="System.Xml.XmlSerializer" Version="4.4.0-*" />
+    <PackageReference Include="System.Runtime.Serialization.Xml" Version="$(CoreFxVersion)-*" />
+    <PackageReference Include="System.Xml.XmlSerializer" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/Microsoft.AspNetCore.Mvc.Razor.Host.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.Host/Microsoft.AspNetCore.Mvc.Razor.Host.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.4.0-*" />
+    <PackageReference Include="System.ComponentModel.TypeConverter" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="System.Runtime.Loader" Version="4.4.0-*" />
+    <PackageReference Include="System.Runtime.Loader" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
@@ -31,8 +31,8 @@ Microsoft.AspNetCore.Mvc.ViewComponent</Description>
     <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="1.2.0-*" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="System.Buffers" Version="4.4.0-*" />
-    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.4.0-*" />
+    <PackageReference Include="System.Buffers" Version="$(CoreFxVersion)-*" />
+    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/...icrosoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj b/...icrosoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj
@@ -20,8 +20,8 @@ System.Web.Http.ApiController</Description>
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
-    <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.4.0-*" />
-    <PackageReference Include="System.Xml.XmlSerializer" Version="4.4.0-*" />
+    <PackageReference Include="System.Runtime.Serialization.Xml" Version="$(CoreFxVersion)-*" />
+    <PackageReference Include="System.Xml.XmlSerializer" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.4.0-*" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.4.0-*" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>
diff --git a/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.4.0-*" />
+    <PackageReference Include="System.Diagnostics.TraceSource" Version="$(CoreFxVersion)-*" />
   </ItemGroup>
 
 </Project>