Merge remote-tracking branch 'dotnet/master' into sqlperf-envchange

Commit migrated from dotnet/corefx@6343429
temfordump · Mar 29, 2019 · 4787736 · 4787736
2 parents 848ab16 + 3912b10
commit 4787736
Show file tree

Hide file tree

Showing 117 changed files with 4,198 additions and 555 deletions.
diff --git a/docs/libraries/project-docs/issue-guide.md b/docs/libraries/project-docs/issue-guide.md
@@ -129,7 +129,7 @@ Feel free to use other labels if it helps your triage efforts (e.g. **needs more
 #### Motivation for triage rules
 
 1. Each issue has exactly one **area-\*** label
-    * Motivation: Issues with multiple areas have loose responbility (everyone blames the other side) and issues are double counted in reports.
+    * Motivation: Issues with multiple areas have loose responsibility (everyone blames the other side) and issues are double counted in reports.
 1. Issue has no **Assignee**, unless someone is working on the issue at the moment
     * Motivation: Observation is that contributors are less likely to grab assigned issues, no matter what the repo rules say.
 1. Use **up-for-grabs** as much as possible, ideally with a quick note about next steps / complexity of the issue

diff --git a/eng/VersionTools.targets b/eng/VersionTools.targets
diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets
@@ -1,18 +1,19 @@
 <Project>
 
-  <PropertyGroup Condition="'$(ApplyPartialNgenOptimization)' == ''">
-     <ApplyPartialNgenOptimization Condition="'$(IsReferenceAssembly)' == 'true'">false</ApplyPartialNgenOptimization>
-     <ApplyPartialNgenOptimization Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">false</ApplyPartialNgenOptimization>
+  <PropertyGroup Condition="'$(IsEligibleForNgenOptimization)' == ''">
+     <IsEligibleForNgenOptimization>true</IsEligibleForNgenOptimization>
+     <IsEligibleForNgenOptimization Condition="'$(IsReferenceAssembly)' == 'true'">false</IsEligibleForNgenOptimization>
+     <IsEligibleForNgenOptimization Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">false</IsEligibleForNgenOptimization>
   </PropertyGroup>
 
-  <Target Name="SetApplyPartialNgenOptimization"
-          Condition="'$(ApplyPartialNgenOptimization)' == ''"
+  <Target Name="SetApplyNgenOptimization"
+          Condition="'$(IsEligibleForNgenOptimization)' == 'true'"
           BeforeTargets="CoreCompile">
     <ItemGroup>
       <_optimizationDataAssembly Include="$(IbcOptimizationDataDir)**\$(TargetFileName)" />
     </ItemGroup>
     <PropertyGroup>
-      <ApplyPartialNgenOptimization Condition="'@(_optimizationDataAssembly)' != ''">true</ApplyPartialNgenOptimization>
+      <ApplyNgenOptimization Condition="'@(_optimizationDataAssembly)' != ''">full</ApplyNgenOptimization>
     </PropertyGroup>
   </Target>
 

diff --git a/eng/dependencies.props b/eng/dependencies.props
@@ -9,10 +9,9 @@
        These ref versions are pulled from https://github.com/dotnet/versions.
   -->
   <PropertyGroup>
-    <ProjectNTfsCurrentRef>ea0e3d580c010d948912887012751b2c7dea10a8</ProjectNTfsCurrentRef>
-    <ProjectNTfsTestILCCurrentRef>ea0e3d580c010d948912887012751b2c7dea10a8</ProjectNTfsTestILCCurrentRef>
+    <ProjectNTfsCurrentRef>1ec5055956dc17901d269b582a9af9fa82475387</ProjectNTfsCurrentRef>
+    <ProjectNTfsTestILCCurrentRef>1ec5055956dc17901d269b582a9af9fa82475387</ProjectNTfsTestILCCurrentRef>
     <SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
-    <BuildToolsCurrentRef>fff00830cfa4d8d1fc4ec39b249999d3457a0f6f</BuildToolsCurrentRef>
   </PropertyGroup>
 
   <!-- Product dependency versions. -->
@@ -23,9 +22,9 @@
 
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
-    <ProjectNTfsExpectedPrerelease>beta-27525-00</ProjectNTfsExpectedPrerelease>
-    <ProjectNTfsTestILCExpectedPrerelease>beta-27525-00</ProjectNTfsTestILCExpectedPrerelease>
-    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-27525-00</ProjectNTfsTestILCPackageVersion>
+    <ProjectNTfsExpectedPrerelease>beta-27527-00</ProjectNTfsExpectedPrerelease>
+    <ProjectNTfsTestILCExpectedPrerelease>beta-27527-00</ProjectNTfsTestILCExpectedPrerelease>
+    <ProjectNTfsTestILCPackageVersion>1.0.0-beta-27527-00</ProjectNTfsTestILCPackageVersion>
 
     <!-- CoreFX-built SNI identity package -->
     <RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
@@ -47,12 +46,6 @@
     <TestILCX86retPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCX86retPackageVersion>
   </PropertyGroup>
 
-  <!-- Package versions used as toolsets -->
-  <PropertyGroup>
-    <BuildToolsPackage>Microsoft.DotNet.BuildTools</BuildToolsPackage>
-    <BuildToolsPackageVersion>3.0.0-preview1-03805-01</BuildToolsPackageVersion>
-  </PropertyGroup>
-
   <!-- Publish symbol build task package -->
   <PropertyGroup>
     <PublishSymbolsPackage>Microsoft.SymbolUploader.Build.Task</PublishSymbolsPackage>
@@ -79,10 +72,6 @@
       <BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs-testilc/$(DependencyBranch)</BuildInfoPath>
       <CurrentRef>$(ProjectNTfsTestILCCurrentRef)</CurrentRef>
     </RemoteDependencyBuildInfo>
-    <RemoteDependencyBuildInfo Include="BuildTools">
-      <BuildInfoPath>$(BaseDotNetBuildInfo)buildtools/$(DependencyBranch)</BuildInfoPath>
-      <CurrentRef>$(BuildToolsCurrentRef)</CurrentRef>
-    </RemoteDependencyBuildInfo>
 
     <DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
       <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
@@ -108,11 +97,6 @@
       <ElementName>RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion</ElementName>
       <PackageId>runtime.win-x64.runtime.native.System.Data.SqlClient.sni</PackageId>
     </XmlUpdateStep>
-    <XmlUpdateStep Include="BuildTools">
-      <Path>$(MSBuildThisFileFullPath)</Path>
-      <ElementName>BuildToolsPackageVersion</ElementName>
-      <PackageId>Microsoft.DotNet.BuildTools</PackageId>
-    </XmlUpdateStep>
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/eng/pipelines/libraries/corefx-base.yml b/eng/pipelines/libraries/corefx-base.yml
@@ -82,8 +82,9 @@ jobs:
           - group: DotNet-Blob-Feed
 
         - ${{ if eq(job.submitToHelix, 'true') }}:
-          - group: DotNet-HelixApi-Access
           - _archiveTestsParameter: /p:ArchiveTests=Tests
+          - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
+            - group: DotNet-HelixApi-Access
 
         - _args: -restore -build -configuration $(_BuildConfig) -ci -buildtests -arch $(_architecture) -framework $(_framework) $(_archiveTestsParameter)
         - _commonArguments: $(_args)

diff --git a/eng/pipelines/libraries/linux.yml b/eng/pipelines/libraries/linux.yml
@@ -92,14 +92,14 @@ jobs:
           - _outerloop: true
 
         - ${{ if eq(parameters.isOfficialBuild, 'false') }}:
-          - linuxDefaultQueues: Centos.7.Amd64.Open+RedHat.7.Amd64.Open+Debian.8.Amd64.Open+Ubuntu.1604.Amd64.Open+Ubuntu.1804.Amd64.Open+OpenSuse.42.Amd64.Open+Fedora.27.Amd64.Open
-          - linuxArm64Queues: Ubuntu.1604.Arm64.Open
+          - linuxDefaultQueues: Centos.7.Amd64.Open+RedHat.7.Amd64.Open+Debian.8.Amd64.Open+Ubuntu.1604.Amd64.Open+Ubuntu.1804.Amd64.Open+OpenSuse.42.Amd64.Open+Fedora.28.Amd64.Open
+          - linuxArm64Queues: '\(Ubuntu.1604.Arm64\)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-b049512-20190321153539'
 
         - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
-          - linuxDefaultQueues: Centos.7.Amd64+RedHat.7.Amd64+Debian.8.Amd64+Debian.9.Amd64+Ubuntu.1604.Amd64+Ubuntu.1804.Amd64+Ubuntu.1810.Amd64+OpenSuse.42.Amd64+SLES.12.Amd64+SLES.15.Amd64+Fedora.27.Amd64+Fedora.28.Amd64
-          - linuxArm64Queues: Ubuntu.1604.Arm64
+          - linuxDefaultQueues: Centos.7.Amd64+RedHat.7.Amd64+Debian.8.Amd64+Debian.9.Amd64+Ubuntu.1604.Amd64+Ubuntu.1804.Amd64+Ubuntu.1810.Amd64+OpenSuse.42.Amd64+SLES.12.Amd64+SLES.15.Amd64+\(Fedora.28.Amd64\)[email protected]/dotnet-buildtools/prereqs:fedora-28-helix-45b1fa2-20190327215722+\(Fedora.29.Amd64\)[email protected]/dotnet-buildtools/prereqs:fedora-29-helix-c6dc5e6-20190319174449'
+          - linuxArm64Queues: '\(Ubuntu.1604.Arm64\)[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-b049512-20190321153539'
           - linuxArmQueues: '\(Debian.9.Arm32\)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm32v7-b049512-20190321153542'
-          - alpineQueues: Alpine.36.Amd64+Alpine.38.Amd64
+          - alpineQueues: '\(Alpine.36.Amd64\)[email protected]/dotnet-buildtools/prereqs:alpine-3.6-helix-45b1fa2-20190327215821+\(Alpine.38.Amd64\)[email protected]/dotnet-buildtools/prereqs:alpine-3.8-helix-45b1fa2-20190327215821+\(Alpine.39.Amd64\)[email protected]/dotnet-buildtools/prereqs:alpine-3.9-helix-e4eaef4-20190228230637'
 
     # Legs without helix testing
     # There is no point of running legs without outerloop tests, when in an outerloop build.

diff --git a/eng/pipelines/libraries/publish.yml b/eng/pipelines/libraries/publish.yml
@@ -10,7 +10,7 @@ jobs:
       jobs:
       - job: PublishPackages
         displayName: Publish Packages
-        timeoutInMinutes: 120
+        timeoutInMinutes: 160
 
         ${{ if ne(parameters.dependsOn, '') }}:
           dependsOn: ${{ parameters.dependsOn }}
@@ -95,12 +95,12 @@ jobs:
                     /p:Configuration=${{ parameters.buildConfiguration }}
             displayName: Publish to Build Assets Registry
 
-          - script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 eng\publish.proj
-                    -warnaserror:0 -ci
-                    /t:NuGetPush
-                    /p:NuGetSource=$(_mygetFeedUrl)
-                    /p:NuGetApiKey=$(dotnet-myget-org-api-key)
-            displayName: Push to myget.org
+          # - script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 eng\publish.proj
+          #           -warnaserror:0 -ci
+          #           /t:NuGetPush
+          #           /p:NuGetSource=$(_mygetFeedUrl)
+          #           /p:NuGetApiKey=$(dotnet-myget-org-api-key)
+          #   displayName: Push to myget.org
 
           - script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 build.proj
                     -warnaserror:0 -ci

diff --git a/eng/pipelines/libraries/windows.yml b/eng/pipelines/libraries/windows.yml
@@ -96,12 +96,6 @@ jobs:
               _framework: uap
               _helixQueues: $(uapNetfxQueues)
 
-            UAP_arm_Release:
-              _BuildConfig: Release
-              _architecture: arm
-              _framework: uap
-              _helixQueues: $(windowsArmQueue)
-
             UAPAOT_x86_Release:
               _BuildConfig: Release
               _architecture: x86
@@ -223,6 +217,11 @@ jobs:
                 _architecture: arm
                 _framework: netcoreapp
 
+              UAP_arm_Release:
+                _BuildConfig: Release
+                _architecture: arm
+                _framework: uap
+
               UAPAOT_arm_Release:
                 _BuildConfig: Release
                 _architecture: arm

diff --git a/eng/sendtohelix.proj b/eng/sendtohelix.proj
@@ -10,7 +10,7 @@
     <HelixBuild Condition="'$(HelixBuild)' == ''">$(BUILD_BUILDNUMBER)</HelixBuild>
     <HelixBuild Condition="'$(HelixBuild)' == ''">default</HelixBuild>
 
-    <TimeoutInSeconds Condition="'$(TimeoutInSeconds)' == ''">600</TimeoutInSeconds>
+    <TimeoutInSeconds Condition="'$(TimeoutInSeconds)' == ''">900</TimeoutInSeconds>
     <_timeoutSpan>$([System.TimeSpan]::FromSeconds($(TimeoutInSeconds)))</_timeoutSpan>
 
     <!-- We need to enable xunit reporter so that it parses test results

diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.LChflags.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.LChflags.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Sys
+    {
+        [Flags]
+        internal enum UserFlags : uint
+        {
+            UF_HIDDEN = 0x8000
+        }
+
+        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_LChflags", SetLastError = true)]
+        internal static extern int LChflags(string path, uint flags);
+
+        internal static readonly bool CanSetHiddenFlag = (LChflagsCanSetHiddenFlag() != 0);
+
+        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_LChflagsCanSetHiddenFlag")]
+        private static extern int LChflagsCanSetHiddenFlag();
+    }
+}
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.QueryPerformanceCounter.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.QueryPerformanceCounter.cs
diff --git a/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.QueryPerformanceFrequency.cs b/src/libraries/Common/src/Interop/Windows/Kernel32/Interop.QueryPerformanceFrequency.cs
diff --git a/src/libraries/Common/tests/StaticTestGenerator/Directory.Build.props b/src/libraries/Common/tests/StaticTestGenerator/Directory.Build.props
@@ -0,0 +1,2 @@
+<!-- Standalone project. Avoid being tied to the build infrastructure in the repo. -->
+<Project/>
diff --git a/src/libraries/Common/tests/StaticTestGenerator/Directory.Build.targets b/src/libraries/Common/tests/StaticTestGenerator/Directory.Build.targets
@@ -0,0 +1,2 @@
+<!-- Standalone project. Avoid being tied to the build infrastructure in the repo. -->
+<Project/>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<!-- Standalone project. Avoid being tied to the build infrastructure in the repo. -->
		<Project/>