[automated] Merge branch 'release/2.1' => 'release/2.2'

BuildToolsVersion.txt

@@ -1 +1 @@
-2.1.0-rc1-02913-01
+2.1.0-rc1-03006-01

build.proj

@@ -29,9 +29,15 @@
   <Import Project="$(ToolsDir)clean.targets" />
 
   <PropertyGroup>
-    <TraversalBuildDependsOn>
+    <PrebuildSetupTargets>
       GenerateConfigurationProperties;
-      CreateOrUpdateCurrentVersionFile;
+      CreateOrUpdateCurrentVersionFile
+    </PrebuildSetupTargets>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TraversalBuildDependsOn>
+      $(PrebuildSetupTargets);
       $(TraversalBuildDependsOn);
     </TraversalBuildDependsOn>
   </PropertyGroup>
@@ -42,7 +48,7 @@
     <GenerateConfigurationProps Properties="@(Property)" PropertyValues="@(PropertyValue)" PropsFolder="$(BuildConfigurationFolder)" />
   </Target>
 
-  <Target Name="Sync" DependsOnTargets="GenerateConfigurationProperties">
+  <Target Name="Sync" DependsOnTargets="$(PrebuildSetupTargets)">
     <ItemGroup>
       <ExternalProject Include="external\dir.proj" />
     </ItemGroup>

dependencies.props

@@ -9,15 +9,15 @@
        These ref versions are pulled from https://github.com/dotnet/versions.
   -->
   <PropertyGroup>
-    <CoreFxCurrentRef>11f431e6bd908d5fdd94c187d2741d9c40a4287d</CoreFxCurrentRef>
-    <CoreClrCurrentRef>11f431e6bd908d5fdd94c187d2741d9c40a4287d</CoreClrCurrentRef>
-    <CoreSetupCurrentRef>11f431e6bd908d5fdd94c187d2741d9c40a4287d</CoreSetupCurrentRef>
+    <CoreFxCurrentRef>b933a1ea9efa451dc6e06da2920f1c93253160b2</CoreFxCurrentRef>
+    <CoreClrCurrentRef>b933a1ea9efa451dc6e06da2920f1c93253160b2</CoreClrCurrentRef>
+    <CoreSetupCurrentRef>b933a1ea9efa451dc6e06da2920f1c93253160b2</CoreSetupCurrentRef>
     <ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
     <ProjectNTfsCurrentRef>ccd922b62227c43ed2dac6bcb737321dd2b07be0</ProjectNTfsCurrentRef>
     <ProjectNTfsTestILCCurrentRef>ccd922b62227c43ed2dac6bcb737321dd2b07be0</ProjectNTfsTestILCCurrentRef>
     <SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
     <StandardCurrentRef>c520a2569b40fc53cf51e4f6970c3e7411adc173</StandardCurrentRef>
-    <BuildToolsCurrentRef>d1e2bedf58a4a66aadda4f5751ecdaf3ad4f62fe</BuildToolsCurrentRef>
+    <BuildToolsCurrentRef>8fc22d261883eb7a1f8765bfe716d806303d0318</BuildToolsCurrentRef>
   </PropertyGroup>
 
   <!-- Product dependency versions. -->
@@ -31,23 +31,23 @@
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>servicing</CoreFxExpectedPrerelease>
-    <MicrosoftNETCorePlatformsPackageVersion>2.1.0</MicrosoftNETCorePlatformsPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.1-servicing-26606-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <CoreFxExpectedPrerelease>servicing-26708-02</CoreFxExpectedPrerelease>
+    <MicrosoftNETCorePlatformsPackageVersion>2.1.1-servicing-26708-02</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.3-servicing-26708-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <ProjectNTfsExpectedPrerelease>beta-26413-00</ProjectNTfsExpectedPrerelease>
     <ProjectNTfsTestILCExpectedPrerelease>beta-26413-00</ProjectNTfsTestILCExpectedPrerelease>
     <ProjectNTfsTestILCPackageVersion>1.0.0-beta-26413-00</ProjectNTfsTestILCPackageVersion>
-    <MicrosoftNETCoreDotNetHostPackageVersion>2.1.1</MicrosoftNETCoreDotNetHostPackageVersion>
-    <MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.1</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>2.1.1</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreDotNetHostPackageVersion>2.1.3-servicing-26708-02</MicrosoftNETCoreDotNetHostPackageVersion>
+    <MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.3-servicing-26708-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>2.1.3-servicing-26708-02</MicrosoftNETCoreAppPackageVersion>
 
     <!-- CoreFX-built SNI identity package -->
     <RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
 
     <AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
     <XunitPerfAnalysisPackageVersion>1.0.0-beta-build0019</XunitPerfAnalysisPackageVersion>
     <TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
-    <XunitNetcoreExtensionsVersion>2.1.0-rc1-02913-01</XunitNetcoreExtensionsVersion>
+    <XunitNetcoreExtensionsVersion>2.1.0-rc1-03006-01</XunitNetcoreExtensionsVersion>
 
     <!-- Roslyn optimization data package version -->
     <OptimizationDataVersion>2.0.0-rc-61101-17</OptimizationDataVersion>
@@ -56,7 +56,7 @@
   <!-- Package versions used as toolsets -->
   <PropertyGroup>
     <FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
-    <FeedTasksPackageVersion>2.1.0-rc1-02913-01</FeedTasksPackageVersion>
+    <FeedTasksPackageVersion>2.1.0-rc1-03006-01</FeedTasksPackageVersion>
   </PropertyGroup>
 
   <!-- Publish symbol build task package -->

dir.targets

@@ -93,6 +93,15 @@
     </BinPlaceConfiguration>
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(BlockStable)' == 'true'">
+    <!--
+      If BlockStable is set to true then always include the label and build number in the package version.
+      This needs to be set before we import packaging.targets which comes in the Build.Common.targets.
+    -->
+    <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
+    <IncludeBuildNumberInPackageVersion>true</IncludeBuildNumberInPackageVersion>
+  </PropertyGroup>
+
   <Import Project="$(ToolsDir)/Build.Common.targets" Condition="Exists('$(ToolsDir)/Build.Common.targets')" />
 
   <!-- permit a wrapping build system to contribute targets to this build -->

pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json

@@ -4641,6 +4641,33 @@
     "any",
     "base"
   ],
+  "tizen-x86": [
+    "tizen-x86",
+    "tizen",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen-x86-corert": [
+    "tizen-x86-corert",
+    "tizen-corert",
+    "tizen-x86",
+    "linux-x86-corert",
+    "tizen",
+    "linux-corert",
+    "linux-x86",
+    "unix-x86-corert",
+    "linux",
+    "unix-corert",
+    "unix-x86",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "tizen.4.0.0": [
     "tizen.4.0.0",
     "tizen",
@@ -4695,6 +4722,141 @@
     "any",
     "base"
   ],
+  "tizen.4.0.0-x86": [
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86",
+    "tizen",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.4.0.0-x86-corert": [
+    "tizen.4.0.0-x86-corert",
+    "tizen.4.0.0-corert",
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86-corert",
+    "tizen-corert",
+    "tizen-x86",
+    "tizen",
+    "linux-x86-corert",
+    "linux-corert",
+    "linux-x86",
+    "linux",
+    "unix-x86-corert",
+    "unix-corert",
+    "unix-x86",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0": [
+    "tizen.5.0.0",
+    "tizen.4.0.0",
+    "tizen",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-armel": [
+    "tizen.5.0.0-armel",
+    "tizen.5.0.0",
+    "tizen.4.0.0-armel",
+    "tizen.4.0.0",
+    "tizen-armel",
+    "tizen",
+    "linux-armel",
+    "linux",
+    "unix-armel",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-armel-corert": [
+    "tizen.5.0.0-armel-corert",
+    "tizen.5.0.0-corert",
+    "tizen.5.0.0-armel",
+    "tizen.5.0.0",
+    "tizen.4.0.0-armel-corert",
+    "tizen.4.0.0-corert",
+    "tizen.4.0.0-armel",
+    "tizen.4.0.0",
+    "tizen-armel-corert",
+    "tizen-corert",
+    "tizen-armel",
+    "tizen",
+    "linux-armel-corert",
+    "linux-corert",
+    "linux-armel",
+    "linux",
+    "unix-armel-corert",
+    "unix-corert",
+    "unix-armel",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-corert": [
+    "tizen.5.0.0-corert",
+    "tizen.5.0.0",
+    "tizen.4.0.0-corert",
+    "tizen.4.0.0",
+    "tizen-corert",
+    "tizen",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-x86": [
+    "tizen.5.0.0-x86",
+    "tizen.5.0.0",
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86",
+    "tizen",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-x86-corert": [
+    "tizen.5.0.0-x86-corert",
+    "tizen.5.0.0-corert",
+    "tizen.5.0.0-x86",
+    "tizen.5.0.0",
+    "tizen.4.0.0-x86-corert",
+    "tizen.4.0.0-corert",
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86-corert",
+    "tizen-corert",
+    "tizen-x86",
+    "tizen",
+    "linux-x86-corert",
+    "linux-corert",
+    "linux-x86",
+    "linux",
+    "unix-x86-corert",
+    "unix-corert",
+    "unix-x86",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "ubuntu": [
     "ubuntu",
     "debian",

pkg/Microsoft.NETCore.Platforms/runtime.json

@@ -1817,6 +1817,19 @@
         "linux-corert"
       ]
     },
+    "tizen-x86": {
+      "#import": [
+        "tizen",
+        "linux-x86"
+      ]
+    },
+    "tizen-x86-corert": {
+      "#import": [
+        "tizen-corert",
+        "tizen-x86",
+        "linux-x86-corert"
+      ]
+    },
     "tizen.4.0.0": {
       "#import": [
         "tizen"
@@ -1842,6 +1855,59 @@
         "tizen-corert"
       ]
     },
+    "tizen.4.0.0-x86": {
+      "#import": [
+        "tizen.4.0.0",
+        "tizen-x86"
+      ]
+    },
+    "tizen.4.0.0-x86-corert": {
+      "#import": [
+        "tizen.4.0.0-corert",
+        "tizen.4.0.0-x86",
+        "tizen.4.0.0",
+        "tizen-x86-corert"
+      ]
+    },
+    "tizen.5.0.0": {
+      "#import": [
+        "tizen.4.0.0"
+      ]
+    },
+    "tizen.5.0.0-armel": {
+      "#import": [
+        "tizen.5.0.0",
+        "tizen.4.0.0-armel"
+      ]
+    },
+    "tizen.5.0.0-armel-corert": {
+      "#import": [
+        "tizen.5.0.0-corert",
+        "tizen.5.0.0-armel",
+        "tizen.5.0.0",
+        "tizen.4.0.0-armel-corert"
+      ]
+    },
+    "tizen.5.0.0-corert": {
+      "#import": [
+        "tizen.5.0.0",
+        "tizen.4.0.0-corert"
+      ]
+    },
+    "tizen.5.0.0-x86": {
+      "#import": [
+        "tizen.5.0.0",
+        "tizen.4.0.0-x86"
+      ]
+    },
+    "tizen.5.0.0-x86-corert": {
+      "#import": [
+        "tizen.5.0.0-corert",
+        "tizen.5.0.0-x86",
+        "tizen.5.0.0",
+        "tizen.4.0.0-x86-corert"
+      ]
+    },
     "ubuntu": {
       "#import": [
         "debian"

pkg/Microsoft.NETCore.Platforms/runtimeGroups.props

@@ -111,8 +111,8 @@
 
     <RuntimeGroup Include="tizen">
       <Parent>linux</Parent>
-      <Architectures>armel</Architectures>
-      <Versions>4.0.0</Versions>
+      <Architectures>x86;armel</Architectures>
+      <Versions>4.0.0;5.0.0</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="ubuntu">

pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props

@@ -28,5 +28,8 @@
     <OfficialBuildRID Include="tizen.4.0.0-armel">
       <Platform>armel</Platform>
     </OfficialBuildRID>
+    <OfficialBuildRID Include="tizen.5.0.0-armel">
+      <Platform>armel</Platform>
+    </OfficialBuildRID>
   </ItemGroup>
 </Project>

src/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt

@@ -26,6 +26,9 @@ set(NATIVECRYPTO_SOURCES
     pal_x509chain.cpp
 )
 
+# Temporary workaround for dotnet/corefx issue #30599
+add_compile_options(-Wno-deprecated-declarations)
+
 add_library(System.Security.Cryptography.Native.Apple
     SHARED
     ${NATIVECRYPTO_SOURCES}