Adding BuildAndPublishInsights.yml to CI.yml so that the headers and libs are included in the CI builds.

build/AzurePipelinesTemplates/WindowsAppSDK-BuildAndPublishInsights-Steps.yml

@@ -1,6 +1,5 @@
 parameters:
-  CommonHeadersDirectory: $(Build.SourcesDirectory)\dev\Common
-  WindowsAppSDKInsightsSourceDirectory: $(Build.SourcesDirectory)\dev\WindowsAppSDKInsightsResource
+  WindowsAppSDKInsightsSourceDirectory: $(Build.SourcesDirectory)\dev\WindowsAppSDK_Insights
   WindowsAppSDKInsightsBinariesDirectory: $(Build.SourcesDirectory)\BuildOutput
 
 steps:
@@ -10,20 +9,31 @@ steps:
     versionSpec: 5.6
   continueOnError: true
 
+- task: NuGetAuthenticate@0
+  inputs:
+    nuGetServiceConnections: 'TelemetryInternal'
+
 - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
-  displayName: 'NuGet restore of WIL'
+  displayName: 'NuGet restore of packages'
   inputs:
     command: 'custom'
-    arguments: 'restore ${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\WindowsAppSDKInsightsResourceLib\packages.config -ConfigFile nuget.config -PackagesDirectory ${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\packages'
+    arguments: 'restore ${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\WindowsAppSDKInsightsLib\packages.config -ConfigFile nuget.config -PackagesDirectory ${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\packages'
 
+- task: powershell@2
+  name: UpdateTraceloggingConfig
+  inputs:
+    targetType: 'inline'
+    script: |
+      $srcPath = get-childitem -path 'dev\WindowsAppSDK_Insights\packages' -File 'MicrosoftTelemetry.h' -Recurse
+      $destinationPath = get-childitem -path 'dev\WindowsAppSDK_Insights\packages' -File 'Traceloggingconfig.h' -Recurse
+      echo $srcPath.FullName, $destinationPath.FullName
+      copy-item -Force $srcPath.FullName $destinationPath.FullName
 
 - task: MSBuild@1
   displayName: 'build WindowsAppSDKInsights lib'
   inputs:
-#      msbuildLocationMethod: 'location'
-#      msbuildLocation: ${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\.buildtools\MSBuild\Current\Bin\MSBuild.exe
     platform: '$(buildPlatform)'
-    solution: '${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\WindowsAppSDKInsightsResourceLib\WindowsAppSDKInsightsResourceLib.vcxproj'
+    solution: '${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\WindowsAppSDKInsightsLib\WindowsAppSDKInsightsLib.vcxproj'
     configuration: '$(buildConfiguration)'
     msbuildArguments: '/restore /binaryLogger:$(Build.SourcesDirectory)/WindowsAppSDKInsights.$(buildPlatform).$(buildConfiguration).binlog'
 
@@ -42,40 +52,19 @@ steps:
 - task: CopyFiles@2
   displayName: 'copy WindowsAppSDKInsights.h into output folder'
   inputs:
-    SourceFolder: '${{ parameters.CommonHeadersDirectory }}'
+    SourceFolder: '${{ parameters.WindowsAppSDKInsightsSourceDirectory }}'
     Contents: |
       WindowsAppSDKInsights.h
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\include'
     flattenFolders: true
 
 - task: CopyFiles@2
-  displayName: 'copy import lib x86'
-  condition: and(succeeded(), eq(variables['buildPlatform'], 'x86'))
-  inputs:
-    SourceFolder: '$(Build.ArtifactStagingDirectory)\Microsoft.WindowsAppSDK.Insights\lib\x86'
-    Contents: |
-      Microsoft.WindowsAppSDK.Insights.lib
-    TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\win10-x86'
-    flattenFolders: true
-
-- task: CopyFiles@2
-  displayName: 'copy import lib x64'
-  condition: and(succeeded(), eq(variables['buildPlatform'], 'x64'))
-  inputs:
-    SourceFolder: '$(Build.ArtifactStagingDirectory)\Microsoft.WindowsAppSDK.Insights\lib\x64'
-    Contents: |
-      Microsoft.WindowsAppSDK.Insights.lib
-    TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\win10-x64'
-    flattenFolders: true
-
-- task: CopyFiles@2
-  displayName: 'copy import lib ARM64'
-  condition: and(succeeded(), eq(variables['buildPlatform'], 'ARM64'))
+  displayName: 'copy import lib $(buildPlatform)'
   inputs:
-    SourceFolder: '$(Build.ArtifactStagingDirectory)\Microsoft.WindowsAppSDK.Insights\lib\ARM64'
+    SourceFolder: '$(Build.ArtifactStagingDirectory)\Microsoft.WindowsAppSDK.Insights\lib\$(buildPlatform)'
     Contents: |
       Microsoft.WindowsAppSDK.Insights.lib
-    TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\win10-arm64'
+    TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\win10-$(buildPlatform)'
     flattenFolders: true
 
 - task: PublishBuildArtifacts@1

build/ProjectReunion-CI.yml

@@ -131,6 +131,12 @@ jobs:
       TSLint: false
       ToolLogsNotFoundAction: 'Standard'
 
+- job: PublishInsights
+  pool:
+    vmImage: 'windows-latest'
+  steps:
+  - template: AzurePipelinesTemplates\WindowsAppSDK-BuildAndPublishInsights-Steps.xml
+
 - job: PublishMRT
   dependsOn:
     - BuildMRT

build/build-mrt.yml

@@ -19,6 +19,10 @@ steps:
     versionSpec: 5.6
   continueOnError: true
 
+- task: NuGetAuthenticate@0
+  inputs:
+    nuGetServiceConnections: 'TelemetryInternal'
+
 # Start restoring packages for C++ projects. The C# ones will be restored by the build task
 # Note: 'NuGetCommand@2' is ambiguous so the specific task GUID must be used instead.
 - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2