Merge pull request #512 from AArnott/fixOptProf

Merge latest Library.Template

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "powershell": {
-      "version": "7.4.3",
+      "version": "7.4.4",
       "commands": [
         "pwsh"
       ]

.editorconfig

@@ -185,6 +185,9 @@ dotnet_diagnostic.DOC202.severity = warning
 # CA1062: Validate arguments of public methods
 dotnet_diagnostic.CA1062.severity = warning
 
+# CA2016: Forward the CancellationToken parameter
+dotnet_diagnostic.CA2016.severity = warning
+
 # We should drop use of the BinaryFormatter and bring back this warning.
 # SYSLIB0011: Type or member is obsolete
 dotnet_diagnostic.SYSLIB0011.severity = suggestion

azure-pipelines/release.yml

@@ -54,7 +54,7 @@ extends:
         - download: CI
           artifact: deployables-Windows
           displayName: 🔻 Download deployables-Windows artifact
-          patterns: 'deployables-Windows/NuGet/*'
+          patterns: 'NuGet/*'
         - task: GitHubRelease@1
           displayName: 📢 GitHub release (create)
           inputs:

src/VSInsertionMetadata/VSInsertionMetadata.targets

@@ -25,14 +25,10 @@
     <TargetsForTfmSpecificContentInPackage>
       $(TargetsForTfmSpecificContentInPackage);
       SubstituteProfilingInputsMacro;
-      SubstituteProfilingInputsMacroWarning;
     </TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
-  <Target Name="SubstituteProfilingInputsMacroWarning" Condition="'$(ProfilingInputsDropName)'==''">
-    <Warning Text="The ProfilingInputsDropName msbuild property has not been set, and the OptProf will not contain accurate content."/>
-  </Target>
-  <Target Name="SubstituteProfilingInputsMacro" Condition="'$(ProfilingInputsDropName)'!=''">
+  <Target Name="SubstituteProfilingInputsMacro">
     <ItemGroup>
       <ProfilingInputsSource Include="ProfilingInputs.props" />
       <ProfilingInputsTarget Include="$(IntermediateOutputPath)ProfilingInputs.props" />
@@ -43,13 +39,20 @@
       OutputFilename="@(ProfilingInputsTarget)"
       MatchExpression="%TESTSTORE%"
       ReplacementText="vstsdrop:$(ProfilingInputsDropName)" />
+
+    <Warning
+      Text="The ProfilingInputsDropName msbuild property has not been set, and the OptProf will not contain accurate content."
+      Condition="'$(ProfilingInputsDropName)' == ''" />
+    <Copy SourceFiles="@(ProfilingInputsSource)" DestinationFiles="@(ProfilingInputsTarget)"
+      Condition="'$(ProfilingInputsDropName)' == ''" />
+
     <ItemGroup>
       <TfmSpecificPackageFile Include="@(ProfilingInputsTarget)" PackagePath="InsertionVS/" />
     </ItemGroup>
   </Target>
   <Target Name="EnsureUniquePackageVersion"
-          Condition="'$(Build_BuildId)' != ''"
-          AfterTargets="GetBuildVersion">
+    Condition="'$(Build_BuildId)' != ''"
+    AfterTargets="GetBuildVersion">
     <!--
        We must ensure unique versions for the insertion metadata package so
        it can contain information that is unique to this build.
@@ -61,4 +64,7 @@
       <PackageVersion>$(PackageVersion).$(Build_BuildId)</PackageVersion>
     </PropertyGroup>
   </Target>
+  <Target Name="BreakForRename" BeforeTargets="Pack;GenerateNuspec" Condition="'$(MSBuildProjectName)'=='Library.VSInsertionMetadata'">
+    <Error Text="This project should be renamed so the library name is used instead of 'Library'. Then delete this target." />
+  </Target>
 </Project>