projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a9825d6)
Update harvested package versions
authorWes Haggard <Wes.Haggard@microsoft.com>
Mon, 27 Aug 2018 18:38:13 +0000 (11:38 -0700)
committerWes Haggard <Wes.Haggard@microsoft.com>
Wed, 29 Aug 2018 00:56:46 +0000 (17:56 -0700)
Commit migrated from https://github.com/dotnet/corefx/commit/5312b96dbdf8d504f35903aa86baca52a3254d16

src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj patch | blob | history
src/libraries/external/harvestPackages/harvestPackages.depproj patch | blob | history
src/libraries/external/harvestPackages/harvestPackages.props patch | blob | history
src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj patch | blob | history
src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj patch | blob | history

diff --git a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
index 6a85ba0..102d36f 100644 (file)
--- a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
+++ b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
@@ -20,15 +20,4 @@
     <SuppressMetaPackage Include="NETStandard.Library" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
-  <ItemGroup>
-    <!--
-      All frameworks except net45 support the frozen 4.2.0.0 api version. Need to include this after Directory.Build.targets to
-      have DefaultValidateionFramework defined. Normally this wouldn't be necessary but the harvested supported
-      frameworks all complain if we don't lift the version of the assembly they support. This won't be any issue
-      once the 4.5.0 package is stable and we can harvest it.
-    -->
-    <SupportedFramework Include="@(DefaultValidateFramework)">
-      <Version>4.2.0.0</Version>
-    </SupportedFramework>
-  </ItemGroup>
 </Project>
diff --git a/src/libraries/external/harvestPackages/harvestPackages.depproj b/src/libraries/external/harvestPackages/harvestPackages.depproj
index a4731ad..c499108 100644 (file)
--- a/src/libraries/external/harvestPackages/harvestPackages.depproj
+++ b/src/libraries/external/harvestPackages/harvestPackages.depproj
@@ -27,14 +27,14 @@
     <GetLastStablePackage
         LatestPackages="@(PackageReference)"
         PackageIndexes="$(PackageIndexFile)">
-        <Output  TaskParameter="LastStablePackages" ItemName="_NewPackageReferences" />
+        <Output TaskParameter="LastStablePackages" ItemName="_NewPackageReferences" />
     </GetLastStablePackage>
 
     <ItemGroup>
       <_Lines Include="&lt;Project xmlns=&quot;http://schemas.microsoft.com/developer/msbuild/2003&quot;&gt;" />
       <_Lines Include="&lt;!-- The versions can be updated by running UpdateToLatestStablePackages target in harvestPackages.depproj --&gt;" />
       <_Lines Include="&lt;ItemGroup&gt;" />
-      <_Lines Include="&lt;PackageReference Include=&quot;%(_NewPackageReferences.Identity)&quot;&gt;&#13;  &lt;Version&gt;%(_NewPackageReferences.Version)&lt;/Version&gt;&#13;&lt;/PackageReference&gt;" />
+      <_Lines Include="&lt;PackageReference Include=&quot;%(_NewPackageReferences.Identity)&quot;&gt;&#13;&#10;  &lt;Version&gt;%(_NewPackageReferences.Version)&lt;/Version&gt;&#13;&#10;&lt;/PackageReference&gt;" />
       <_Lines Include="&lt;/ItemGroup&gt;" />
       <_Lines Include="&lt;/Project&gt;" />
     </ItemGroup>
diff --git a/src/libraries/external/harvestPackages/harvestPackages.props b/src/libraries/external/harvestPackages/harvestPackages.props
index fdc9715..ae54243 100644 (file)
--- a/src/libraries/external/harvestPackages/harvestPackages.props
+++ b/src/libraries/external/harvestPackages/harvestPackages.props
@@ -1,52 +1,194 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-<!-- The versions can be updated by running UpdateToLatestStablePackages target in harvestPackages.depproj -->\r
-<ItemGroup>\r
-<PackageReference Include="Microsoft.CSharp">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="Microsoft.VisualBasic">\r  <Version>10.3.0</Version>\r</PackageReference>\r
-<PackageReference Include="Microsoft.Win32.Registry">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="Microsoft.Win32.Registry.AccessControl">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Buffers">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.CodeDom">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Collections.Immutable">\r  <Version>1.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.ComponentModel.Annotations">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Composition">\r  <Version>1.2.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Composition.AttributedModel">\r  <Version>1.2.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Composition.Convention">\r  <Version>1.2.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Composition.Hosting">\r  <Version>1.2.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Composition.Runtime">\r  <Version>1.2.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Composition.TypedParts">\r  <Version>1.2.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Configuration.ConfigurationManager">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Data.SqlClient">\r  <Version>4.5.1</Version>\r</PackageReference>\r
-<PackageReference Include="System.Diagnostics.DiagnosticSource">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.IO.FileSystem.AccessControl">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.IO.Packaging">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.IO.Pipes.AccessControl">\r  <Version>4.5.1</Version>\r</PackageReference>\r
-<PackageReference Include="System.IO.Ports">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Json">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Net.Http.WinHttpHandler">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Numerics.Vectors">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Reflection.Context">\r  <Version>4.3.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Reflection.DispatchProxy">\r  <Version>4.5.1</Version>\r</PackageReference>\r
-<PackageReference Include="System.Reflection.Emit">\r  <Version>4.3.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Reflection.Metadata">\r  <Version>1.6.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Reflection.TypeExtensions">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Runtime.CompilerServices.Unsafe">\r  <Version>4.5.1</Version>\r</PackageReference>\r
-<PackageReference Include="System.Runtime.WindowsRuntime">\r  <Version>4.3.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml">\r  <Version>4.3.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Security.AccessControl">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Security.Cryptography.Cng">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Security.Cryptography.OpenSsl">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Security.Cryptography.Pkcs">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Security.Cryptography.ProtectedData">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Security.Cryptography.Xml">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Security.Permissions">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Security.Principal.Windows">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.ServiceProcess.ServiceController">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Text.Encoding.CodePages">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Text.Encodings.Web">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Threading.AccessControl">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Threading.Tasks.Dataflow">\r  <Version>4.9.0</Version>\r</PackageReference>\r
-<PackageReference Include="System.Threading.Tasks.Extensions">\r  <Version>4.5.1</Version>\r</PackageReference>\r
-<PackageReference Include="System.ValueTuple">\r  <Version>4.5.0</Version>\r</PackageReference>\r
-</ItemGroup>\r
-</Project>\r
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- The versions can be updated by running UpdateToLatestStablePackages target in harvestPackages.depproj -->
+<ItemGroup>
+<PackageReference Include="Microsoft.CSharp">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="Microsoft.VisualBasic">
+  <Version>10.3.0</Version>
+</PackageReference>
+<PackageReference Include="Microsoft.Win32.Registry">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="Microsoft.Win32.Registry.AccessControl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="Microsoft.Win32.SystemEvents">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="runtime.native.System.Data.SqlClient.sni">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Buffers">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.CodeDom">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Collections.Immutable">
+  <Version>1.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.ComponentModel.Annotations">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.ComponentModel.Composition">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.AttributedModel">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.Convention">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.Hosting">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.Runtime">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Composition.TypedParts">
+  <Version>1.2.0</Version>
+</PackageReference>
+<PackageReference Include="System.Configuration.ConfigurationManager">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Data.DataSetExtensions">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Data.Odbc">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Data.SqlClient">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Diagnostics.DiagnosticSource">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Diagnostics.PerformanceCounter">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.DirectoryServices">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.DirectoryServices.AccountManagement">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.DirectoryServices.Protocols">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Drawing.Common">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.IO.FileSystem.AccessControl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.IO.Packaging">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.IO.Pipelines">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.IO.Pipes.AccessControl">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.IO.Ports">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Json">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Management">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Net.Http.WinHttpHandler">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Net.WebSockets.WebSocketProtocol">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Numerics.Vectors">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Reflection.Context">
+  <Version>4.3.0</Version>
+</PackageReference>
+<PackageReference Include="System.Reflection.DispatchProxy">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Reflection.Emit">
+  <Version>4.3.0</Version>
+</PackageReference>
+<PackageReference Include="System.Reflection.Metadata">
+  <Version>1.6.0</Version>
+</PackageReference>
+<PackageReference Include="System.Reflection.TypeExtensions">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Runtime.Caching">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.Runtime.WindowsRuntime">
+  <Version>4.3.0</Version>
+</PackageReference>
+<PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml">
+  <Version>4.3.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.AccessControl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.Cng">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.OpenSsl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.Pkcs">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.ProtectedData">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Cryptography.Xml">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Permissions">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Security.Principal.Windows">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.ServiceModel.Syndication">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.ServiceProcess.ServiceController">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Text.Encoding.CodePages">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Text.Encodings.Web">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Threading.AccessControl">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Threading.Channels">
+  <Version>4.5.0</Version>
+</PackageReference>
+<PackageReference Include="System.Threading.Tasks.Dataflow">
+  <Version>4.9.0</Version>
+</PackageReference>
+<PackageReference Include="System.Threading.Tasks.Extensions">
+  <Version>4.5.1</Version>
+</PackageReference>
+<PackageReference Include="System.ValueTuple">
+  <Version>4.5.0</Version>
+</PackageReference>
+</ItemGroup>
+</Project>
diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj
index 6590b08..5180f37 100644 (file)
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj
@@ -7,6 +7,8 @@
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
     <SkipValidatePackage>true</SkipValidatePackage>
     <OmitDependencies>true</OmitDependencies>
+    <!-- We don't need to harvest the stable packages to build this -->
+    <HarvestStablePackage>false</HarvestStablePackage>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
index cc12736..a66f76d 100644 (file)
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
@@ -6,6 +6,8 @@
     <_PreReleasePackageVersion>$(PackageVersion)</_PreReleasePackageVersion>
     <PackageVersion>2.1.0</PackageVersion>
     <ServiceModelVersion>4.4.1</ServiceModelVersion>
+    <!-- We don't need to harvest the stable packages to build this -->
+    <HarvestStablePackage>false</HarvestStablePackage>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <PrereleaseLibraryPackage>
Domain: Dotnet / Core;