Minor engineering cleanup (#173)

Fix SourceLink validation failures.

Add back the PR merge build trigger

Add back setting DotNetPublishUsingPipelines

Author: mikem8361

Directory.Build.targets

@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <!-- Work around https://github.com/dotnet/sourcelink/issues/572
+       Remove once we build using an SDK that contains https://github.com/dotnet/sdk/pull/10613 -->
+  <PropertyGroup>
+    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
+  </ItemGroup>
 </Project>

azure-pipelines.yml

@@ -1,4 +1,5 @@
-trigger: none
+trigger:
+- master
 
 pr:
   autoCancel: true
@@ -10,18 +11,14 @@ pr:
     exclude:
     - docs/*
     - THIRD-PARTY-NOTICES.TXT
-    - LICENSE.TXT
+    - License.txt
 
 variables:
   - name: _TeamName
     value: DotNetCore
-  - name: _DotNetArtifactsCategory
-    value: .NETCore
+  - name: _SignType
+    value: real
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - name: _SignType
-      value: real
-    - name: _PublishBlobFeedUrl
-      value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
     # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
     # DotNet-Diagnostics-SDL-Params provides Tsa* variables for SDL checks.
     # DotNet-Symbol-Server-Pats provides: provides microsoft-symbol-server-pat and symweb-symbol-server-pat
@@ -68,17 +65,13 @@ stages:
             matrix:
               build_debug:
                 _BuildConfig: Debug
+                _InternalBuildArgs: ''
               build_release:
                 _BuildConfig: Release
                 ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-                  _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
-                                      /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
-                                      /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
-                                      /p:DotNetPublishBlobFeedUrl=$(_PublishBlobFeedUrl)
-                                      /p:DotNetPublishToBlobFeed=$(PublishPackages)
+                  _InternalBuildArgs: /p:DotNetSignType=$(_SignType) 
+                                      /p:TeamName=$(_TeamName)
                                       /p:DotNetPublishUsingPipelines=$(PublishPackages)
-                                      /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
-                                      /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
                                       /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
 
           steps:
@@ -91,16 +84,6 @@ stages:
             displayName: Build
             condition: succeeded()
 
-          - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-            - task: PublishBuildArtifacts@1
-              displayName: Publish Package Artifacts
-              inputs:
-                PathtoPublish: '$(Build.SourcesDirectory)/artifacts/packages'
-                PublishLocation: Container
-                ArtifactName: Packages
-              continueOnError: true
-              condition: always()
-
         - job: Linux
           container: LinuxContainer
           pool:
@@ -172,5 +155,5 @@ stages:
           -TsaCodebaseName "symstore"
           -TsaPublish $True'
           artifactNames:
-          - 'Packages'
+          - 'PackageArtifacts'