Adding BuildAndPublishInsights.yml to CI.yml so that the headers and …

…libs are included in the CI builds. (#1149)

* Add a YML script to publish the WindowsAppSDKTelemetry header

* Add a YML script to publish the WindowsAppSDKTelemetry header

* Add a YML script to publish the WindowsAppSDKTelemetry header

* - Adding the BuildAndPublishInsights.yml to the ProjectReunion-CI.yml

* Adding a script to auto generate the rc file for the resource dll that will contain the values needed to log PartB telemetry. The PartB struct contains the SDK version, experimentation flag and other data
* The .rc file for the resource project is generated from the resource.templ file checked in with the project.
* The script must be executed before running the build step on this solution.
* Adding WindowsAppSDKTelemetry.h that will reference this resource dll to construct the PartB structure.

* Add a YML script to publish the WindowsAppSDKTelemetry header

* Add a YML script to publish the WindowsAppSDKTelemetry header

* Add a YML script to publish the WindowsAppSDKTelemetry header

* * Renamed the Telemetry lib project to conform to other WindowsAppSDK project names (Microsoft.WindowsAppSDKTelemetry.lib)
* Added a property in Native.C.Props to reference the library when linking against WindowsAppSDK.Foundation nuget package

* * Renamed all projects to Insights
* Renamed the Insights lib project to conform to other WindowsAppSDK project names (Microsoft.WindowsAppSDK.Insights.lib)
* Added a property in Native.C.Props to reference the library when linking against WindowsAppSDK.Foundation nuget package

* Add a YML script to publish the WindowsAppSDKTelemetry header

* Add a YML script to publish the WindowsAppSDKTelemetry header

* Add a YML script to publish the WindowsAppSDKTelemetry header

* - Adding the BuildAndPublishInsights.yml to the ProjectReunion-CI.yml

* Set DefaultLanguage (#1160)

* Adding an explicit reference to resources winmd causes invalid appxmanifest.xml build error (#1159)

* Adding an explicit reference to Microsoft.ApplicationModel.Resources.winmd causes invalid appxmanifest.xml build error

* Added resources winmd for C++/WinRT clients

* Move PushNotifications overrides out of GenerateDynamicDependenciesOverrides.ps1 (#1152)

* Adding PowerNotification APIs (#1142)

* Adding PowerNotifications Proj

* Adding PowerNotifications Tests

* Adding FrameworkUDK Nuget

* Added entry to build/NuSpecs/AppxManifest
Added 'Factory()' to handle static functions
Removed TODO comments
{0} to {}

Co-authored-by: Huzaifa Danish <modanish@microsoft.com>, Brian Alker <brial@microsoft.com>

* * Adding a dependency on Microsoft.Windows.ImplementationLibrary. This is so that only projects that reference the Insights will get a reference to Microsoft WIL.

* * Adding a dependency on Microsoft.Windows.ImplementationLibrary. This is so that only projects that reference the Insights will get a reference to Microsoft WIL.

* * Adding a dependency on Microsoft.Windows.ImplementationLibrary. This is so that only projects that reference the Insights will get a reference to Microsoft WIL.

Co-authored-by: Hui Chen <huichen@microsoft.com>
Co-authored-by: Scott Jones <sjones@microsoft.com>
Co-authored-by: Howard Kapustein <howardk@microsoft.com>
Co-authored-by: Huzaifa Danish <shaan3@gmail.com>
Co-authored-by: Huzaifa Danish <modanish@microsoft.com>, Brian Alker <brial@microsoft.com>
Co-authored-by: MythiliM <mmythili@gmail.com>

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,34 @@ 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 ${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\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
 
+      if(($srcPath -ne $null) -and ($destinationPath -ne $null))
+      {
+        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 +55,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-BuildFoundation.yml

@@ -10,6 +10,9 @@ parameters:
   - name: "PublishToMaestro"
     type: boolean
     default: False
+  - name: "WindowsAppSDKInsightsSourceDirectory"
+    type: string
+    default: $(Build.SourcesDirectory)\dev\WindowsAppSDK_Insights
 
 jobs:
 - job: CredScan
@@ -66,7 +69,18 @@ jobs:
   variables:
     buildOutputDir : $(Build.SourcesDirectory)\BuildOutput
     publishDir : $(Build.ArtifactStagingDirectory)
+
   steps:
+  - task: NuGetAuthenticate@0
+    inputs:
+      nuGetServiceConnections: 'TelemetryInternal'
+
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+    displayName: 'NuGet restore of packages'
+    inputs:
+      command: 'custom'
+      arguments: 'restore ${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\WindowsAppSDKInsightsLib\packages.config -ConfigFile ${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\nuget.config -PackagesDirectory ${{ parameters.WindowsAppSDKInsightsSourceDirectory }}\packages'
+
   # Download and extract nuget package with non-stubbed MicrosoftTelemetry.h header
 #  - task: DownloadPackage@1
 #    displayName: 'Download Microsoft.Telemetry.Inbox.Native'

build/build-mrt.yml

@@ -94,6 +94,19 @@ steps:
 #    displayName: 'Debug'
 #    inputs:
 #      filename: '$(Build.SourcesDirectory)\build\debug-pipeline.cmd'
+- 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 '${{ parameters.MRTSourcesDirectory }}\mrt\packages' -File 'Traceloggingconfig.h' -Recurse
+
+      if(($srcPath -ne $null) -and ($destinationPath -ne $null))
+      {
+        echo $srcPath.FullName, $destinationPath.FullName
+        copy-item -Force $srcPath.FullName $destinationPath.FullName
+      }
 
 - task: MSBuild@1
   displayName: 'build MrtCore'