Merge pull request #1471 from microsoft/dev/andarno/nativeAOT

Add trim and NativeAOT safety attributes

Author: AArnott

Directory.Build.props

@@ -41,6 +41,19 @@
     <LangVersion Condition="'$(MSBuildProjectExtension)'=='.vbproj'">16.9</LangVersion>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <RidOsPrefix Condition="$([MSBuild]::IsOsPlatform('Windows'))">win</RidOsPrefix>
+    <RidOsPrefix Condition="$([MSBuild]::IsOsPlatform('Linux'))">linux</RidOsPrefix>
+    <RidOsPrefix Condition="$([MSBuild]::IsOsPlatform('OSX'))">osx</RidOsPrefix>
+
+    <RidOsArchitecture Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'x64'">x64</RidOsArchitecture>
+    <RidOsArchitecture Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'ARM64'">arm64</RidOsArchitecture>
+
+    <DefaultRuntimeIdentifier>$(RidOsPrefix)-$(RidOsArchitecture)</DefaultRuntimeIdentifier>
+    <!-- <AvailableRuntimeIdentifiers>$(RidOsPrefix)-arm64;$(RidOsPrefix)-x64</AvailableRuntimeIdentifiers> -->
+    <AvailableRuntimeIdentifiers>$(DefaultRuntimeIdentifier)</AvailableRuntimeIdentifiers>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="$(RepoRootPath)obj/NOTICE" Pack="true" PackagePath="" Visible="false" Condition=" Exists('$(RepoRootPath)obj/NOTICE') " />
   </ItemGroup>

Directory.Build.targets

@@ -4,4 +4,6 @@
     <!-- Avoid compile error about missing namespace when combining ImplicitUsings with .NET Framework target frameworks. -->
     <Using Remove="System.Net.Http" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />
   </ItemGroup>
+
+  <Import Project="Directory.Traversal.targets" Condition="'$(IsTraversal)'=='true'" />
 </Project>

Directory.Traversal.targets

@@ -0,0 +1,15 @@
+<Project>
+  <PropertyGroup>
+    <PackInParallel>true</PackInParallel>
+
+    <TestX64Binaries>false</TestX64Binaries>
+    <TestArm64Binaries>false</TestArm64Binaries>
+    <TestX64Binaries Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'x64'">true</TestX64Binaries>
+    <TestArm64Binaries Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'ARM64'">true</TestArm64Binaries>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- <ProjectReference Include="@(MultiRIDProjectReference)" AdditionalProperties="RuntimeIdentifier=$(RidOsPrefix)-x64" Test="$(TestX64Binaries)" />
+    <ProjectReference Include="@(MultiRIDProjectReference)" AdditionalProperties="RuntimeIdentifier=$(RidOsPrefix)-arm64" Test="$(TestArm64Binaries)" /> -->
+    <ProjectReference Include="@(MultiRIDProjectReference)" AdditionalProperties="RuntimeIdentifier=$(DefaultRuntimeIdentifier);TargetFramework=%(TargetFramework)" Test="true" />
+  </ItemGroup>
+</Project>

Microsoft.VisualStudio.Threading.slnx

@@ -11,16 +11,21 @@
     <File Path="Directory.Build.props" />
     <File Path="Directory.Build.targets" />
     <File Path="Directory.Packages.props" />
+    <File Path="Directory.Traversal.targets" />
     <File Path="global.json" />
     <File Path="nuget.config" />
     <File Path="stylecop.json" />
     <File Path="version.json" />
   </Folder>
+  <Folder Name="/Solution Items/tools/">
+    <File Path="tools/dirs.proj" />
+  </Folder>
   <Folder Name="/src/">
     <File Path="src/.editorconfig" />
     <File Path="src/AssemblyInfo.cs" />
     <File Path="src/Directory.Build.props" />
     <File Path="src/Directory.Build.targets" />
+    <File Path="src/dirs.proj" />
     <Project Path="src/Microsoft.VisualStudio.Threading.Analyzers.CodeFixes/Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.csproj" />
     <Project Path="src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/Microsoft.VisualStudio.Threading.Analyzers.CSharp.csproj" />
     <Project Path="src/Microsoft.VisualStudio.Threading.Analyzers.VisualBasic/Microsoft.VisualStudio.Threading.Analyzers.VisualBasic.csproj" />
@@ -33,12 +38,15 @@
   </Folder>
   <Folder Name="/test/">
     <File Path="test/.editorconfig" />
+    <File Path="test/AOT.props" />
     <File Path="test/Directory.Build.props" />
     <File Path="test/Directory.Build.targets" />
+    <File Path="test/dirs.proj" />
     <Project Path="samples/samples.csproj" />
     <Project Path="test/IsolatedTestHost/IsolatedTestHost.csproj" />
     <Project Path="test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Microsoft.VisualStudio.Threading.Analyzers.Tests.csproj" />
     <Project Path="test/Microsoft.VisualStudio.Threading.Tests.Win7RegistryWatcher/Microsoft.VisualStudio.Threading.Tests.Win7RegistryWatcher.csproj" />
     <Project Path="test/Microsoft.VisualStudio.Threading.Tests/Microsoft.VisualStudio.Threading.Tests.csproj" />
+    <Project Path="test/NativeAOTCompatibility.Test/NativeAOTCompatibility.Test.csproj" />
   </Folder>
 </Solution>

azure-pipelines/build.yml

@@ -200,6 +200,7 @@ jobs:
       Is1ESPT: ${{ parameters.Is1ESPT }}
       RunTests: ${{ parameters.RunTests }}
       IsOptProf: ${{ parameters.IsOptProf }}
+      osRID: win
 
   - ${{ if and(parameters.EnableDotNetFormatCheck, not(parameters.EnableLinuxBuild)) }}:
     - script: dotnet format --verify-no-changes
@@ -244,6 +245,7 @@ jobs:
         parameters:
           Is1ESPT: ${{ parameters.Is1ESPT }}
           RunTests: ${{ parameters.RunTests }}
+          osRID: linux
       - ${{ if parameters.EnableDotNetFormatCheck }}:
         - script: dotnet format --verify-no-changes
           displayName: 💅 Verify formatted code
@@ -279,6 +281,7 @@ jobs:
         parameters:
           Is1ESPT: ${{ parameters.Is1ESPT }}
           RunTests: ${{ parameters.RunTests }}
+          osRID: osx
 
   - job: WrapUp
     dependsOn:

azure-pipelines/dotnet.yml

@@ -5,10 +5,12 @@ parameters:
   default: false
 - name: Is1ESPT
   type: boolean
+- name: osRID
+  type: string
 
 steps:
 
-- script: dotnet build -t:build,pack --no-restore -c $(BuildConfiguration) -warnAsError -warnNotAsError:NU1901,NU1902,NU1903,NU1904,LOCTASK002 /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
+- script: dotnet build tools/dirs.proj -t:build,pack,publish --no-restore -c $(BuildConfiguration) -warnAsError -warnNotAsError:NU1901,NU1902,NU1903,NU1904,LOCTASK002 /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
   displayName: 🛠 dotnet build
 
 - ${{ if not(parameters.IsOptProf) }}:

global.json

@@ -6,6 +6,7 @@
   },
   "msbuild-sdks": {
     "MSBuild.Sdk.Extras": "3.0.44",
-    "Microsoft.Build.NoTargets": "3.7.56"
+    "Microsoft.Build.NoTargets": "3.7.56",
+		"Microsoft.Build.Traversal": "4.1.82"
   }
 }

src/Microsoft.VisualStudio.Threading/AsyncReaderWriterLock+HangReportContributor.cs

@@ -3,11 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace Microsoft.VisualStudio.Threading
@@ -46,6 +46,7 @@ protected internal virtual SynchronizationContext NoMessagePumpSynchronizationCo
         /// Contributes data for a hang report.
         /// </summary>
         /// <returns>The hang report contribution. Null values should be ignored.</returns>
+        [RequiresUnreferencedCode(Reasons.DiagnosticAnalysisOnly)]
         HangReportContribution IHangReportContributor.GetHangReport()
         {
             return this.GetHangReport();
@@ -55,7 +56,8 @@ HangReportContribution IHangReportContributor.GetHangReport()
         /// Contributes data for a hang report.
         /// </summary>
         /// <returns>The hang report contribution. Null values should be ignored.</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity"), SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [RequiresUnreferencedCode(Reasons.DiagnosticAnalysisOnly)]
         protected virtual HangReportContribution GetHangReport()
         {
             using (this.NoMessagePumpSynchronizationContext.Apply())
@@ -125,6 +127,7 @@ private static XDocument CreateDgml(out XElement nodes, out XElement links)
         /// <summary>
         /// Appends details of a given collection of awaiters to the hang report.
         /// </summary>
+        [RequiresUnreferencedCode(Reasons.DiagnosticAnalysisOnly)]
         private static XElement CreateAwaiterNode(Awaiter awaiter)
         {
             Requires.NotNull(awaiter, nameof(awaiter));
@@ -211,9 +214,13 @@ public IEnumerable<string> Categories
             {
                 get
                 {
+#if NET
+                    foreach (AwaiterCollection value in Enum.GetValues<AwaiterCollection>())
+#else
 #pragma warning disable CS8605 // Unboxing a possibly null value.
                     foreach (AwaiterCollection value in Enum.GetValues(typeof(AwaiterCollection)))
 #pragma warning restore CS8605 // Unboxing a possibly null value.
+#endif
                     {
                         if (this.Membership.HasFlag(value))
                         {

src/Microsoft.VisualStudio.Threading/IHangReportContributor.cs

@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.VisualStudio.Threading;
 
@@ -18,5 +14,6 @@ public interface IHangReportContributor
     /// Contributes data for a hang report.
     /// </summary>
     /// <returns>The hang report contribution. Null values should be ignored.</returns>
+    [RequiresUnreferencedCode(Reasons.DiagnosticAnalysisOnly)]
     HangReportContribution GetHangReport();
 }