Merge pull request #2097 from StephenBonikowsky/FinalPackageUpdates

Update Stable Versions to include 4.4.0 for WCF packages.
dotnet · Jul 25, 2017 · d9c5ced · d9c5ced
2 parents 76afdc4 + d40889c
commit d9c5ced
Show file tree

Hide file tree

Showing 23 changed files with 84 additions and 53 deletions.
diff --git a/dependencies.props b/dependencies.props
@@ -1,17 +1,17 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
   <PropertyGroup>
-    <CoreFxCurrentRef>534770cbd98c4083de4d93b809f2e0968f0f856a</CoreFxCurrentRef>
+    <CoreFxCurrentRef>23359c17ebe3ba84865dda6b81792d27b160b0d6</CoreFxCurrentRef>
     <WCFCurrentRef>a2ba4d6141ef25bdb4c2d2c014b9e1f305a0ea90</WCFCurrentRef>
-    <StandardCurrentRef>8f8313cbe4b0f4d89c4d0835e08e3e340a18eec0</StandardCurrentRef>
+    <StandardCurrentRef>23359c17ebe3ba84865dda6b81792d27b160b0d6</StandardCurrentRef>
     <CoreSetupCurrentRef>c2c072242cb0bdea99efb7349d69492f83200a7d</CoreSetupCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>preview2-25405-01</CoreFxExpectedPrerelease>
+    <CoreFxExpectedPrerelease>preview3-25519-03</CoreFxExpectedPrerelease>
     <WcfExpectedPrerelease>preview2-25413-01</WcfExpectedPrerelease>
-    <NETStandardPackageVersion>2.0.0-preview2-25401-01</NETStandardPackageVersion>
+    <NETStandardPackageVersion>2.0.0</NETStandardPackageVersion>
     <NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
     <MicrosoftNETCoreAppPackageVersion>2.0.0-preview2-25407-01</MicrosoftNETCoreAppPackageVersion>
   </PropertyGroup>

diff --git a/pkg/baseline/baseline.props b/pkg/baseline/baseline.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CoreFxBaseLinePackageName>Microsoft.Private.PackageBaseline</CoreFxBaseLinePackageName>
-    <CoreFxBaseLinePackageVersion>2.0.0-preview2-25405-01</CoreFxBaseLinePackageVersion>
+    <CoreFxBaseLinePackageVersion>2.0.0-preview3-25519-03</CoreFxBaseLinePackageVersion>
     <!-- NuGet doesn't currently write out the versionless props/targets for this, so manually pull it in from packages folder -->
     <CoreFxBaseLinePackageProps Condition="'$(CoreFxBaseLinePackageProps)' == ''">$(PackagesDir)$(CoreFxBaseLinePackageName)/$(CoreFxBaseLinePackageVersion)/build/$(CoreFxBaseLinePackageName).props</CoreFxBaseLinePackageProps>
 

diff --git a/pkg/baseline/packageIndex.json b/pkg/baseline/packageIndex.json
@@ -12,11 +12,15 @@
         "Then raise the package version of the reference so that its at least the baseline version."
       ]
     },
+    "System.Runtime.WindowsRuntime": {
+      "BaselineVersion": "4.3.0"
+    },
     "System.Private.ServiceModel": {
       "StableVersions": [
         "4.0.0",
         "4.1.0",
-        "4.3.0"
+        "4.3.0",
+        "4.4.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -29,7 +33,8 @@
       "StableVersions": [
         "4.0.0",
         "4.0.1",
-        "4.3.0"
+        "4.3.0",
+        "4.4.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -46,7 +51,8 @@
         "4.0.0",
         "4.0.10",
         "4.1.0",
-        "4.3.0"
+        "4.3.0",
+        "4.4.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -63,7 +69,8 @@
       "StableVersions": [
         "4.0.0",
         "4.1.0",
-        "4.3.0"
+        "4.3.0",
+        "4.4.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -79,7 +86,8 @@
         "3.9.0",
         "4.0.0",
         "4.1.0",
-        "4.3.0"
+        "4.3.0",
+        "4.4.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -96,7 +104,8 @@
         "3.9.0",
         "4.0.0",
         "4.0.1",
-        "4.3.0"
+        "4.3.0",
+        "4.4.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},

diff --git a/pkg/baseline/project.json b/pkg/baseline/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.Private.PackageBaseline": "2.0.0-preview2-25405-01",
+    "Microsoft.Private.PackageBaseline": "2.0.0-preview3-25519-03",
     "System.ServiceModel.Duplex": "4.3.0",
     "System.ServiceModel.Http": "4.3.0",
     "System.ServiceModel.NetTcp": "4.3.0",

diff --git a/src/Common/test-runtime/project.json b/src/Common/test-runtime/project.json
@@ -7,12 +7,12 @@
         "OpenCover": "4.6.519",
         "ReportGenerator": "2.4.3",
         "Microsoft.NETCore.TestHost": "2.0.0-preview2-25304-01",
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
+        "NETStandard.Library": "2.0.0",
         "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
         "xunit.console.netcore": "1.0.3-prerelease-00925-01",
         "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
-        "System.Net.Http.WinHttpHandler": "4.4.0-preview2-25405-01",
+        "System.Reflection.DispatchProxy": "4.4.0",
+        "System.Net.Http.WinHttpHandler": "4.4.0",
         "System.ServiceModel.Duplex": "4.4.0-preview2-25413-01",
         "System.ServiceModel.Http": "4.4.0-preview2-25413-01",
         "System.ServiceModel.NetTcp": "4.4.0-preview2-25413-01",
@@ -30,7 +30,7 @@
         "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
         "xunit.console.netcore": "1.0.3-prerelease-00925-01",
         "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
-        "System.Net.Http.WinHttpHandler": "4.4.0-preview2-25405-01",
+        "System.Net.Http.WinHttpHandler": "4.4.0",
         "System.ServiceModel.Duplex": "4.4.0-preview2-25413-01",
         "System.ServiceModel.Http": "4.4.0-preview2-25413-01",
         "System.ServiceModel.NetTcp": "4.4.0-preview2-25413-01",

diff --git a/src/System.Private.ServiceModel/pkg/System.Private.ServiceModel.pkgproj b/src/System.Private.ServiceModel/pkg/System.Private.ServiceModel.pkgproj
@@ -3,6 +3,8 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <PreventImplementationReference>true</PreventImplementationReference>
+    <!-- workaround for https://github.com/dotnet/buildtools/issues/1529 -->
+    <HarvestVersion>4.3.0</HarvestVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\System.Private.ServiceModel.builds" />

diff --git a/src/System.Private.ServiceModel/src/project.json b/src/System.Private.ServiceModel/src/project.json
@@ -2,9 +2,9 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     }

diff --git a/src/System.Private.ServiceModel/src/windows/project.json b/src/System.Private.ServiceModel/src/windows/project.json
@@ -3,10 +3,10 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
-        "System.Net.Http.WinHttpHandler": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
+        "System.Reflection.DispatchProxy": "4.4.0",
+        "System.Net.Http.WinHttpHandler": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     }

diff --git a/src/System.ServiceModel.Duplex/pkg/System.ServiceModel.Duplex.pkgproj b/src/System.ServiceModel.Duplex/pkg/System.ServiceModel.Duplex.pkgproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <!-- workaround for https://github.com/dotnet/buildtools/issues/1529 -->
+    <HarvestVersion>4.3.0</HarvestVersion>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ServiceModel.Duplex.csproj">
       <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>

diff --git a/src/System.ServiceModel.Duplex/ref/project.json b/src/System.ServiceModel.Duplex/ref/project.json
@@ -2,10 +2,10 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
         "System.ServiceModel.Primitives": "4.4.0-preview2-25413-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     }

diff --git a/src/System.ServiceModel.Duplex/src/project.json b/src/System.ServiceModel.Duplex/src/project.json
@@ -2,9 +2,9 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     },

diff --git a/src/System.ServiceModel.Http/pkg/System.ServiceModel.Http.pkgproj b/src/System.ServiceModel.Http/pkg/System.ServiceModel.Http.pkgproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <!-- workaround for https://github.com/dotnet/buildtools/issues/1529 -->
+    <HarvestVersion>4.3.0</HarvestVersion>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ServiceModel.Http.csproj">
       <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>

diff --git a/src/System.ServiceModel.Http/ref/project.json b/src/System.ServiceModel.Http/ref/project.json
@@ -2,10 +2,10 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
         "System.ServiceModel.Primitives": "4.4.0-preview2-25413-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     }

diff --git a/src/System.ServiceModel.Http/src/project.json b/src/System.ServiceModel.Http/src/project.json
@@ -2,9 +2,9 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     },

diff --git a/src/System.ServiceModel.NetTcp/pkg/System.ServiceModel.NetTcp.pkgproj b/src/System.ServiceModel.NetTcp/pkg/System.ServiceModel.NetTcp.pkgproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <!-- workaround for https://github.com/dotnet/buildtools/issues/1529 -->
+    <HarvestVersion>4.3.0</HarvestVersion>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ServiceModel.NetTcp.csproj">
       <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>

diff --git a/src/System.ServiceModel.NetTcp/ref/project.json b/src/System.ServiceModel.NetTcp/ref/project.json
@@ -2,10 +2,10 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
         "System.ServiceModel.Primitives": "4.4.0-preview2-25413-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     }

diff --git a/src/System.ServiceModel.NetTcp/src/project.json b/src/System.ServiceModel.NetTcp/src/project.json
@@ -2,9 +2,9 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     },

diff --git a/src/System.ServiceModel.Primitives/pkg/System.ServiceModel.Primitives.pkgproj b/src/System.ServiceModel.Primitives/pkg/System.ServiceModel.Primitives.pkgproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <!-- workaround for https://github.com/dotnet/buildtools/issues/1529 -->
+    <HarvestVersion>4.3.0</HarvestVersion>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ServiceModel.Primitives.csproj">
       <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>

diff --git a/src/System.ServiceModel.Primitives/ref/project.json b/src/System.ServiceModel.Primitives/ref/project.json
@@ -2,9 +2,9 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     }

diff --git a/src/System.ServiceModel.Primitives/src/project.json b/src/System.ServiceModel.Primitives/src/project.json
@@ -2,9 +2,9 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     },

diff --git a/src/System.ServiceModel.Security/pkg/System.ServiceModel.Security.pkgproj b/src/System.ServiceModel.Security/pkg/System.ServiceModel.Security.pkgproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <!-- workaround for https://github.com/dotnet/buildtools/issues/1529 -->
+    <HarvestVersion>4.3.0</HarvestVersion>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ServiceModel.Security.csproj">
       <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>

diff --git a/src/System.ServiceModel.Security/ref/project.json b/src/System.ServiceModel.Security/ref/project.json
@@ -2,10 +2,10 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
         "System.ServiceModel.Primitives": "4.4.0-preview2-25413-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     }

diff --git a/src/System.ServiceModel.Security/src/project.json b/src/System.ServiceModel.Security/src/project.json
@@ -2,9 +2,9 @@
   "frameworks": {
     "netstandard2.0": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-preview2-25401-01",
-        "System.Security.Principal.Windows": "4.4.0-preview2-25405-01",
-        "System.Reflection.DispatchProxy": "4.4.0-preview2-25405-01",
+        "NETStandard.Library": "2.0.0",
+        "System.Security.Principal.Windows": "4.4.0",
+        "System.Reflection.DispatchProxy": "4.4.0",
         "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-preview1-25218-03"
       }
     }