User/eho makai/reunion framework package (#163)

* allow framework package step to run

* update ProjectReunion.sln with FWP folder hierarchy plus csproj and ps1 edits

* copy framework pkg PRI (and turn on debugging in createnugetpackage yml)

* frameworkpackage PRI project updates

* create localpackages dir

* prune BuildingWithBuildExe

* remove FrameworkPackagePRI and processing

* remove pri from FWP nuspec

* include project reunion dll not design dll

* remove frameworkpackage reference from artifact drop dir in fwp nuspec

* MakeAppxHBelper.cmd

* add outputs to debug makeFWP-steps.yml

* another ProjectReunion_dll fixup

* grr, another projectreunion_dll

* grr2

* winmd not in sdk dir, other removals

* nuke another sdk dir path

* re-enable noiseasset

* remove activatableclass from appxmanifest.xml

* MSTest.pfx

* turn off debugging

* fix ID for framework package nupkg (whatever that is)

* remove activatableclass from appxmanifest and parameterize nuget cmd line

* re-enable reunion version props, script scope for nuget cmd vars

* remove unused FrameworkPackagePRI csproj etc

* try to dump artifacts\drops in CI yml

* fix syntax error

* fix syntax error 2

* undo

* remove noiseasset

* remove noiseasset PNG

* re-enable ActivatableTypes (thx Jevan)

* remove all PRI entries in MakeFrameworkPackage.ps1

* try to get activatable class listing working

* experiment - remove dummy fwp detector type

* fix erroenous ID for nupkg

* remove incorrect line from frameworkpackage nuspec

* turn on debugging temporarily

* publish projectreunion.lib and sampleflatc.h for FWP nupkg

* include microsoft.projectreunion.lib and SampleFlatC.h in fwp nupkg

* fix lib name

ProjectReunion.props

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="SdkVersion.props" />
+  <Target Name="ProjectReunionPropsInfoTask">
+    <Message Text="Including $(MSBuildThisFileDirectory)projectreunion.props"/>
+  </Target>
+  
+  <!-- BaseOutputPath is defined in Directory.Build.props, but that file isn't loaded on lab machines
+       since they have their own directory structure they want to adhere to.  The lab environment variable
+       XES_OUTDIR maps onto the OutDir variable, which is one level above what we want BaseOutputPath to be,
+       so we'll provide a definition for this here based on the value of XES_OUTDIR.
+       The OutDir variable isn't defined automatically in the lab for WPF projects, so we'll provide
+       an explicit definition here as well. -->
+  <PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
+    <BaseOutputPath>$(XES_OUTDIR)\..\</BaseOutputPath>
+    <OutDir>$(XES_OUTDIR)\</OutDir>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)local.props" Condition="Exists('$(MSBuildThisFileDirectory)local.props')"/>
+  
+  <PropertyGroup>
+    <CSLangVersion>7</CSLangVersion>
+    
+    <!-- Surface as errors the warnings that a ProjectReunion file is using a type defined in a later version of ProjectReunion than the min version for which we're compiling. -->
+    <MSBuildWarningsAsErrors>WMC0151;XLS1105</MSBuildWarningsAsErrors>
+  </PropertyGroup>
+</Project>

ProjectReunion.sln

@@ -15,15 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{F3659DFF-2
 		docs\roadmap.md = docs\roadmap.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C9998FB7-6EFA-43B5-BD19-7533405784D6}"
-	ProjectSection(SolutionItems) = preProject
-		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
-		nuget.config = nuget.config
-		privacy.md = privacy.md
-		README.md = README.md
-		SECURITY.md = SECURITY.md
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleWinRT", "dev\SampleWinRT\SampleWinRT.vcxitems", "{0DE4FEFE-5471-4B50-B74B-D817A02B7F0D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleFlatC", "SampleFlatC", "{8A5C2FE6-86D7-4AAA-BE2E-924B8E03B888}"
@@ -51,16 +42,34 @@ Global
 		dev\SampleFlatC\SampleFlatC.vcxitems*{cdce22ec-f7bf-43d4-95d8-2e786229a4e5}*SharedItemsImports = 9
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_test|Any CPU = Debug_test|Any CPU
+		Debug_test|ARM = Debug_test|ARM
+		Debug_test|ARM64 = Debug_test|ARM64
+		Debug_test|x64 = Debug_test|x64
+		Debug_test|x86 = Debug_test|x86
+		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|Any CPU.ActiveCfg = Release|Win32
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|Any CPU.Build.0 = Release|Win32
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|ARM.ActiveCfg = Debug|ARM
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|ARM.Build.0 = Debug|ARM
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|ARM64.Build.0 = Debug|ARM64
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|x64.ActiveCfg = Debug|x64
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|x64.Build.0 = Debug|x64
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|x86.ActiveCfg = Debug|Win32
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug_test|x86.Build.0 = Debug|Win32
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug|ARM.ActiveCfg = Debug|ARM
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug|ARM.Build.0 = Debug|ARM
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -69,6 +78,7 @@ Global
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug|x64.Build.0 = Debug|x64
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug|x86.ActiveCfg = Debug|Win32
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Debug|x86.Build.0 = Debug|Win32
+		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Release|ARM.ActiveCfg = Release|ARM
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Release|ARM.Build.0 = Release|ARM
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -77,6 +87,17 @@ Global
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Release|x64.Build.0 = Release|x64
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Release|x86.ActiveCfg = Release|Win32
 		{B73AD907-6164-4294-88FB-F3C9C10DA1F1}.Release|x86.Build.0 = Release|Win32
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|Any CPU.ActiveCfg = Release|Win32
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|Any CPU.Build.0 = Release|Win32
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|ARM.ActiveCfg = Debug|ARM
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|ARM.Build.0 = Debug|ARM
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|ARM64.Build.0 = Debug|ARM64
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|x64.ActiveCfg = Debug|x64
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|x64.Build.0 = Debug|x64
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|x86.ActiveCfg = Debug|Win32
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug_test|x86.Build.0 = Debug|Win32
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug|ARM.ActiveCfg = Debug|ARM
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug|ARM.Build.0 = Debug|ARM
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -84,6 +105,7 @@ Global
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug|x64.Build.0 = Debug|x64
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug|x86.ActiveCfg = Debug|Win32
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Debug|x86.Build.0 = Debug|Win32
+		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Release|Any CPU.ActiveCfg = Release|Win32
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Release|ARM.ActiveCfg = Release|ARM
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Release|ARM.Build.0 = Release|ARM
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -91,6 +113,22 @@ Global
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Release|x64.Build.0 = Release|x64
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Release|x86.ActiveCfg = Release|Win32
 		{C62688A1-16A0-4729-B6ED-842F4FAA29F3}.Release|x86.Build.0 = Release|Win32
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|Any CPU.ActiveCfg = Release|Win32
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|Any CPU.Build.0 = Release|Win32
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|Any CPU.Deploy.0 = Release|Win32
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|ARM.ActiveCfg = Debug|ARM
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|ARM.Build.0 = Debug|ARM
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|ARM.Deploy.0 = Debug|ARM
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|ARM64.ActiveCfg = Debug|ARM64
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|ARM64.Build.0 = Debug|ARM64
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|ARM64.Deploy.0 = Debug|ARM64
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|x64.ActiveCfg = Debug|x64
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|x64.Build.0 = Debug|x64
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|x64.Deploy.0 = Debug|x64
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|x86.ActiveCfg = Debug|Win32
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|x86.Build.0 = Debug|Win32
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug_test|x86.Deploy.0 = Debug|Win32
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug|ARM.Build.0 = Debug|ARM
 		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -102,6 +140,7 @@ Global
 		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug|x86.ActiveCfg = Debug|Win32
 		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug|x86.Build.0 = Debug|Win32
 		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Debug|x86.Deploy.0 = Debug|Win32
+		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Release|ARM.ActiveCfg = Release|ARM
 		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Release|ARM.Build.0 = Release|ARM
 		{B1A6F5EC-5418-4354-BACF-F7D998EE960D}.Release|ARM.Deploy.0 = Release|ARM

SdkVersion.props

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SDKVersionRS2>10.0.15063.0</SDKVersionRS2>
+	<SDKVersionRS3>10.0.16299.0</SDKVersionRS3>
+	<SDKVersionRS4>10.0.17134.0</SDKVersionRS4>
+	<SDKVersionRS5>10.0.17763.0</SDKVersionRS5>
+	<SDKVersion19H1>10.0.18362.0</SDKVersion19H1>
+	<SDKVersionInsider>10.0.18362.0</SDKVersionInsider>
+  </PropertyGroup>
+  <PropertyGroup>
+    <UseInsiderSDK>true</UseInsiderSDK>
+    <!-- By default we use the publicly shipped SDK version which is 19H1 now -->
+    <ProjectReunionSdkVersion Condition="$(UseInsiderSDK) != 'true'">$(SDKVersion19H1)</ProjectReunionSdkVersion>
+
+    <!-- Setting UseInsiderSDK will allow the code to build to the newest insider SDK 
+         In order to get this from a cmd prompt run 
+         set UseInsiderSDK=true and then launch muxcontrols.sln from that cmd prompt-->
+    <ProjectReunionSdkVersion Condition="$(UseInsiderSDK)=='true'">$(SDKVersionInsider)</ProjectReunionSdkVersion>
+  </PropertyGroup>
+</Project>

build/AzurePipelinesTemplates/ProjectReunion-CreateNugetPackage-Job.yml

@@ -51,8 +51,8 @@ jobs:
       downloadPath: '$(Build.SourcesDirectory)\Artifacts'
 
   # debugging - remove or comment out before completing PR      
-  #- script: |
-  #    dir /s $(Build.SourcesDirectory)
+  - script: |
+      dir /s $(Build.SourcesDirectory)
 
   - template: ProjectReunion-InstallNuget-Steps.yml
 

build/AzurePipelinesTemplates/ProjectReunion-MakeFrameworkPackages-Steps.yml

@@ -5,15 +5,18 @@ steps:
   - powershell: |
       $platforms = @("x86", "x64", "arm", "arm64")
       $configs = @("debug", "release")
+      Write-Host "powershell step in ProjectReunion-MakeFrameworkPackages-Steps.yml - rootPath = $rootPath"
       foreach ($platform in $platforms)
       {
+        Write-Host "Checking $platform"
         foreach ($config in $configs)
         {
+          Write-Host "Checking $config"
           $rootPath = "${{ parameters.buildOutputDir }}\$config\$platform"
           Write-Host ""
-          Write-Host "Checking for $rootPath\Microsoft.ProjectReunion"
+          Write-Host "Checking for $rootPath\ProjectReunion_dll"
           Write-Host ""
-          if (Test-Path "$rootPath\Microsoft.ProjectReunion")
+          if (Test-Path "$rootPath\ProjectReunion_dll")
           {
             $env:BUILDOUTPUT_OVERRIDE = $rootPath
             & $env:Build_SourcesDirectory\tools\MakeAppxHelper.cmd $platform $config -builddate_yymm $env:BUILDDATE_YYMM -builddate_dd $env:BUILDDATE_DD -subversion $env:BUILDREVISION -verbose

build/CopyFilesToStagingDir.ps1

@@ -32,10 +32,12 @@ function PublishFile {
 }
 
 PublishFile -IfExists $FullBuildOutput\projectreunion_dll\Microsoft.ProjectReunion.dll $FullPublishDir\Microsoft.ProjectReunion\
-PublishFile -IfExists $FullBuildOutput\projectreunion_dll\Microsoft.ProjectReunion.pri $FullPublishDir\Microsoft.ProjectReunion\
+PublishFile -IfExists $FullBuildOutput\projectreunion_dll\Microsoft.ProjectReunion.lib $FullPublishDir\Microsoft.ProjectReunion\
+PublishFile -IfExists $FullBuildOutput\projectreunion_dll\SampleFlatC.h $FullPublishDir\Microsoft.ProjectReunion\
+#PublishFile -IfExists $FullBuildOutput\projectreunion_dll\Microsoft.ProjectReunion.pri $FullPublishDir\Microsoft.ProjectReunion\
 #UNDONE - xaml vcxproj re-runs an mdmerge into the sdk node, we are skipping this for now and leaving the winmd in its normal outdir
-PublishFile -IfExists $FullBuildOutput\projectreunion_dll\Microsoft.ProjectReunion.winmd $FullPublishDir\Microsoft.ProjectReunion\
 #PublishFile -IfExists $FullBuildOutput\projectreunion_dll\sdk\Microsoft.ProjectReunion.winmd $FullPublishDir\Microsoft.ProjectReunion\sdk\
+PublishFile -IfExists $FullBuildOutput\projectreunion_dll\Microsoft.ProjectReunion.winmd $FullPublishDir\Microsoft.ProjectReunion\
 
 #PublishFile -IfExists $FullBuildOutput\projectreunion_dll\Generic.xaml $FullPublishDir\Microsoft.ProjectReunion\
 #PublishFile -IfExists $FullBuildOutput\Microsoft.ProjectReunion.Design\Microsoft.ProjectReunion.Design.dll $FullPublishDir\Microsoft.ProjectReunion.Design\

build/FrameworkPackage/FrameworkPackage.csproj

@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\dev\ProjectReunion_DLL\ProjectReunion_DLL.vcxproj">
+      <Project>{B73AD907-6164-4294-88FB-F3C9C10DA1F1}</Project>
+      <Name>Microsoft.ProjectReunion</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="FrameworkPackage_TemporaryKey.pfx" />
+    <None Include="FrameworkPackageContents\AppxManifest.xml" />
+    <None Include="FrameworkPackageContents\FrameworkPackageFiles.txt" />
+    <None Include="FrameworkPackageContents\logo.png" />
+    <None Include="MakeFrameworkPackage.cmd" />
+    <None Include="MakeFrameworkPackage.ps1" />
+  </ItemGroup>
+  <ItemGroup />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{49C6EF1B-58AB-4E44-AF63-054106255A80}</ProjectGuid>
+    <Keyword>StaticLibrary</Keyword>
+    <RootNamespace>FrameworkPackage</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <PropertyGroup>
+    <PowerShellExe Condition=" '$(PowerShellExe)'=='' ">%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellExe>
+    <AppxOutputFileName>$(OutputPath)\Microsoft.ProjectReunion.$(PlatformShortName).appx</AppxOutputFileName>
+  </PropertyGroup>
+  <Target Name="Build">
+    <MSBuild Projects="@(ProjectReference)" Targets="Build" BuildInParallel="true">
+      <Output TaskParameter="TargetOutputs" ItemName="OutputAssemblies" />
+    </MSBuild>
+    <Message Text="WindowsSDKDir: $(WindowsSDKDir) " />
+    <Exec Command="$(PowerShellExe) -ExecutionPolicy Unrestricted -NoLogo -NoProfile -command &quot;&amp; { .\MakeFrameworkPackage.ps1 -Inputs '@(OutputAssemblies)' -OutputDirectory $(OutDir) -OutputAppxFile $(AppxOutputFileName) -WindowsSdkBinDir '$(WindowsSDKDir)\bin\x86' } &quot;" />
+  </Target>
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml

@@ -15,14 +15,6 @@
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.18362.0" />
   </Dependencies>
   <Extensions>
-$(ActivatableTypes)
-      <Extension Category="windows.activatableClass.inProcessServer">
-        <InProcessServer>
-          <Path>Microsoft.ProjectReunion.dll</Path>
-          <!-- Special type that we manually list here which is not part of the Nuget dll distribution package. 
-               This is our breadcrumb that we leave to be able to detect at runtime that we're using the framework package. -->
-          <!-- UNDONE <ActivatableClass ActivatableClassId="Microsoft.UI.Private.Controls.FrameworkPackageDetector" ThreadingModel="both" /> -->
-        </InProcessServer>
-      </Extension>
-    </Extensions>
-</Package>
+  $(ActivatableTypes)
+  </Extensions>
+</Package>

build/FrameworkPackage/MakeFrameworkPackage.ps1

@@ -40,7 +40,8 @@ mkdir -Force $fullOutputPath\Resources | Out-Null
 
 Copy-IntoNewDirectory FrameworkPackageContents\* $fullOutputPath\PackageContents
 
-Copy-IntoNewDirectory PriConfig\* $fullOutputPath
+#Reunion doesn't use the PRI
+#Copy-IntoNewDirectory PriConfig\* $fullOutputPath
 
 $KitsRoot10 = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots" -Name KitsRoot10).KitsRoot10
 $WindowsSdkBinDir = Join-Path $KitsRoot10 "bin\x86"
@@ -54,19 +55,19 @@ if (-not (Test-Path $WindowsSdkBinDir))
 
 $ActivatableTypes = ""
 
-# Copy over and add to the manifest file list the .dll, .winmd for the inputs. Also copy the .pri
-# but don't list it because it will be merged together.
+# Copy over and add to the manifest file list the .dll, .winmd for the inputs. 
 
 Write-Output "Input: $inputDirectory"
-$inputBaseFileName = "Microsoft.UI.Xaml"
+$inputBaseFileName = "Microsoft.ProjectReunion"
 $inputBasePath = $inputDirectory
 
 Copy-IntoNewDirectory "$inputBasePath\$inputBaseFileName.dll" $fullOutputPath\PackageContents
-Copy-IntoNewDirectory "$inputBasePath\$inputBaseFileName.pri" $fullOutputPath\Resources
-Copy-IntoNewDirectory "$inputBasePath\sdk\$inputBaseFileName.winmd" $fullOutputPath\PackageContents
+#UNDONE- not processing into sdk subdir
+#Copy-IntoNewDirectory "$inputBasePath\sdk\$inputBaseFileName.winmd" $fullOutputPath\PackageContents
+Copy-IntoNewDirectory "$inputBasePath\$inputBaseFileName.winmd" $fullOutputPath\PackageContents
 
-Write-Verbose "Copying $inputBasePath\Themes"
-Copy-IntoNewDirectory -IfExists $inputBasePath\Themes $fullOutputPath\PackageContents\Microsoft.ProjectReunion
+#Write-Verbose "Copying $inputBasePath\Themes"
+#Copy-IntoNewDirectory -IfExists $inputBasePath\Themes $fullOutputPath\PackageContents\Microsoft.ProjectReunion
 
 #Find the latest available sdk
 function Get-SDK-References-Path
@@ -93,8 +94,11 @@ Write-Verbose "WindowsSdkBinDir = $WindowsSdkBinDir"
 $foundationWinmdPath = Get-ChildItem -Recurse $sdkReferencesPath"\Windows.Foundation.FoundationContract" -Filter "Windows.Foundation.FoundationContract.winmd" | Select-Object -ExpandProperty FullName
 $universalWinmdPath = Get-ChildItem -Recurse $sdkReferencesPath"\Windows.Foundation.UniversalApiContract" -Filter "Windows.Foundation.UniversalApiContract.winmd" | Select-Object -ExpandProperty FullName
 $refrenceWinmds = $foundationWinmdPath + ";" + $universalWinmdPath
-Write-Verbose "Calling Get-ActivatableTypes with '$inputBasePath\sdk\$inputBaseFileName.winmd' '$refrenceWinmds'"
-$classes = Get-ActivatableTypes $inputBasePath\sdk\$inputBaseFileName.winmd  $refrenceWinmds  | Sort-Object -Property FullName
+#UNDONE - not re-writing to sdk dir
+#Write-Verbose "Calling Get-ActivatableTypes with '$inputBasePath\sdk\$inputBaseFileName.winmd' '$refrenceWinmds'"
+#$classes = Get-ActivatableTypes $inputBasePath\sdk\$inputBaseFileName.winmd  $refrenceWinmds  | Sort-Object -Property FullName
+Write-Verbose "Calling Get-ActivatableTypes with '$inputBasePath\$inputBaseFileName.winmd' '$refrenceWinmds'"
+$classes = Get-ActivatableTypes $inputBasePath\$inputBaseFileName.winmd  $refrenceWinmds  | Sort-Object -Property FullName
 Write-Host $classes.Length Types found.
 @"
 "$inputBaseFileName.dll" "$inputBaseFileName.dll"
@@ -121,8 +125,6 @@ $ActivatableTypes += @"
 
 "@
 
-Copy-IntoNewDirectory ..\..\dev\Materials\Acrylic\Assets\NoiseAsset_256x256_PNG.png $fullOutputPath\Assets
-
 $customPropsFile = "$PSScriptRoot\..\..\version.props"
 Write-Verbose "Looking in $customPropsFile"
 
@@ -132,14 +134,14 @@ if (-not (Test-Path $customPropsFile))
     Exit 1
 }
 [xml]$customProps = (Get-Content $customPropsFile)
-$versionMajor = $customProps.GetElementsByTagName("MUXVersionMajor").'#text'
-$versionMinor = $customProps.GetElementsByTagName("MUXVersionMinor").'#text'
+$versionMajor = $customProps.GetElementsByTagName("ProjectReunionVersionMajor").'#text'
+$versionMinor = $customProps.GetElementsByTagName("ProjectReunionVersionMinor").'#text'
 
 Write-Verbose "CustomProps = $customProps, VersionMajor = '$versionMajor', VersionMinor = '$versionMinor'"
 
 if ((!$versionMajor) -or (!$versionMinor))
 {
-    Write-Error "Expected MUXVersionMajor and MUXVersionMinor tags to be in version.props file"
+    Write-Error "Expected ProjectReunionVersionMajor and ProjectReunionVersionMinor tags to be in version.props file"
     Exit 1
 }
 
@@ -196,12 +198,12 @@ $versionPropsFile =
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MicrosoftUIXamlAppxVersion>$version</MicrosoftUIXamlAppxVersion>
+    <MicrosoftProjectReunionAppxVersion>$version</MicrosoftProjectReunionAppxVersion>
   </PropertyGroup>
 </Project>
 "@
 
-Set-Content -Value $versionPropsFile $fullOutputPath\MicrosoftUIXamlVersion.props
+Set-Content -Value $versionPropsFile $fullOutputPath\MicrosoftProjectReunionVersion.props
 
 
 # Also copy in some loose files 
@@ -230,11 +232,6 @@ $manifestContents = $manifestContents.Replace('$(Version)', "$Version")
 Set-Content -Value $manifestContents $fullOutputPath\PackageContents\AppxManifest.xml
 
 
-# Call GetFullPath to clean up the path -- makepri is very picky about double slashes in the path.
-$priConfigPath = [IO.Path]::GetFullPath("$fullOutputPath\priconfig.xml")
-$priOutputPath = [IO.Path]::GetFullPath("$fullOutputPath\resources.pri")
-$noiseAssetPath = [IO.Path]::GetFullPath("$fullOutputPath\Assets\NoiseAsset_256x256_PNG.png")
-$resourceContents = [IO.Path]::GetFullPath("$fullOutputPath\Resources")
 $pfxPath = [IO.Path]::GetFullPath("..\MSTest.pfx")
 
 pushd $fullOutputPath\PackageContents
@@ -248,17 +245,6 @@ if (($Configuration -ilike "debug") -and (Test-Path $xbfFilesPath))
 "@ } | Out-File -Append -Encoding "UTF8" $fullOutputPath\PackageContents\FrameworkPackageFiles.txt
 }
 
-# Append output path of resources.pri as well
-@"
-"$priOutputPath" "resources.pri"
-"$noiseAssetPath" "Microsoft.ProjectReunion\Assets\NoiseAsset_256x256_PNG.png"
-"@ | Out-File -Append -Encoding "UTF8" $fullOutputPath\PackageContents\FrameworkPackageFiles.txt
-
-$makepriNew = "`"" + (Join-Path $WindowsSdkBinDir "makepri.exe") + "`" new /pr $fullOutputPath /cf $priConfigPath /of $priOutputPath /in $PackageName /o"
-Write-Host $makepriNew
-cmd /c $makepriNew
-if ($LastExitCode -ne 0) { Exit 1 }
-
 $outputAppxFileFullPath = Join-Path $fullOutputPath "$PackageName.appx"
 $outputAppxFileFullPath = [IO.Path]::GetFullPath($outputAppxFileFullPath)
 

build/NuSpecs/ProjectReunionFrameworkPackage.nuspec

@@ -20,10 +20,12 @@
 
 <!--    <file target="lib\uap10.0" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.ProjectReunion\sdk\Microsoft.ProjectReunion.winmd"/> -->
     <file target="lib\uap10.0" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.ProjectReunion\Microsoft.ProjectReunion.winmd"/>
-    <file target="lib\uap10.0" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.ProjectReunion.FrameworkPackagePRI\Microsoft.ProjectReunion.pri"/>
+<!--    <file target="lib\uap10.0" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.ProjectReunion.FrameworkPackagePRI\Microsoft.ProjectReunion.pri"/> -->
 
     <file target="lib\uap10.0" src="Intellisense\Microsoft.ProjectReunion.xml"/>
-    <file target="lib\uap10.0\Design" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.ProjectReunion.Design\Microsoft.ProjectReunion.design.dll"/>
+    <!-- C++ projects need the flat C header declarations and implib -->
+    <file target="lib\native"  src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.ProjectReunion\Microsoft.ProjectReunion.lib" />
+    <file target="include"     src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.ProjectReunion\SampleFlatC.h" /> 
 
 <!-- <file target="tools" src="$TOOLSDIR$\**\*.*"/> -->
 

build/NuSpecs/build-nupkg.ps1

@@ -9,7 +9,7 @@ Param(
     [string]$BuildFlavor = "release",
     [string]$BuildArch = "x86",
     [switch]$NoDeleteTemp,
-    [switch]$SkipFrameworkPackage = $true
+    [switch]$SkipFrameworkPackage
 )
 
 #
@@ -69,8 +69,6 @@ if ($prereleaseversion)
 
 if (!(Test-Path $OutputDir)) { mkdir $OutputDir }
 
-$nupkgtitle = "Microsoft.ProjectReunion"
-
 function New-TemporaryDirectory {
     $parent = [System.IO.Path]::GetTempPath()
     $name = [System.IO.Path]::GetRandomFileName()
@@ -100,6 +98,16 @@ Write-Verbose "TempDir = $($TempDir.FullName)"
 $runtimesDir = "$($TempDir.FullName)\runtimes"
 $toolsDir = "$($TempDir.FullName)\tools"
 
+function ConfigureNugetCommandLine {
+    Param($pkgId)
+
+    $script:nupkgtitle = $pkgId
+    $script:CommonNugetArgs = "-properties `"BuildOutput=$BuildOutput``;ID=$nupkgtitle``;RUNTIMESDIR=$runtimesDir`;TOOLSDIR=$toolsDir`;BUILDFLAVOR=$($BuildFlavor)`;BUILDARCH=$($BuildArch)`""
+    $script:NugetArgs = "$CommonNugetArgs -OutputDirectory $OutputDir"
+}
+
+ConfigureNugetCommandLine("Microsoft.ProjectReunion")
+
 Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.ProjectReunion\Microsoft.ProjectReunion.dll "$runtimesDir\win10-x86\native"
 Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.ProjectReunion\Microsoft.ProjectReunion.pri "$runtimesDir\win10-x86\native"
 Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x64\Microsoft.ProjectReunion\Microsoft.ProjectReunion.dll "$runtimesDir\win10-x64\native"
@@ -109,10 +117,6 @@ Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm\Microsoft.ProjectR
 Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.ProjectReunion\Microsoft.ProjectReunion.dll "$runtimesDir\win10-arm64\native"
 Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.ProjectReunion\Microsoft.ProjectReunion.pri "$runtimesDir\win10-arm64\native"
 
-$CommonNugetArgs = "-properties `"BuildOutput=$BuildOutput``;ID=$nupkgtitle``;RUNTIMESDIR=$runtimesDir`;TOOLSDIR=$toolsDir`;BUILDFLAVOR=$($BuildFlavor)`;BUILDARCH=$($BuildArch)`""
-
-$NugetArgs = "$CommonNugetArgs -OutputDirectory $OutputDir"
-
 #
 # Build Project Reunion package (with actual contents, i.e. not metapackage)
 #
@@ -133,9 +137,7 @@ Write-Host
 # Build Project Reunion package meta package (no direct contents, only references)
 #
 
-$nupkgtitle = "Microsoft.ProjectReunion.MetaPackage"
-$CommonNugetArgs = "-properties `"BuildOutput=$BuildOutput``;ID=$nupkgtitle``;RUNTIMESDIR=$runtimesDir`;TOOLSDIR=$toolsDir`;BUILDFLAVOR=$($BuildFlavor)`;BUILDARCH=$($BuildArch)`""
-$NugetArgs = "$CommonNugetArgs -OutputDirectory $OutputDir"
+ConfigureNugetCommandLine("Microsoft.ProjectReunion.MetaPackage")
 
 $nugetExe = "$scriptDirectory\..\..\tools\NugetWrapper.cmd"
 $NugetCmdLine = "$nugetExe pack ProjectReunionMetaPackage.nuspec $NugetArgs -version $version"
@@ -154,6 +156,8 @@ Write-Host
 
 if(-not $SkipFrameworkPackage)
 {
+    ConfigureNugetCommandLine("Microsoft.ProjectReunion") 
+   
     # Nuget package with framework package encapsulation
     $NugetArgs = "$CommonNugetArgs -OutputDirectory $OutputDir\FrameworkPackage"
 

environment.props

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="$(ProjectReunionFinalRelease) != 'true'">
+    <!-- If ProjectReunionPrelease is unset, default it to false. -->
+    <ProjectReunionFinalRelease>false</ProjectReunionFinalRelease>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(UseInsiderSDK) == 'true'">
+    <DefineConstants>$(DefineConstants);USE_INSIDER_SDK</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(UseInternalSDK) == 'true'">
+    <DefineConstants>$(DefineConstants);USE_INTERNAL_SDK</DefineConstants>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="$(ProjectReunionFinalRelease) == 'false'">
+    <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);PROJECTREUNION_PRERELEASE</PreprocessorDefinitions>
+    </ClCompile>
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);PROJECTREUNION_PRERELEASE</PreprocessorDefinitions>
+    </Midl>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="$(UseInsiderSDK) == 'true'">
+    <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USE_INSIDER_SDK</PreprocessorDefinitions>
+    </ClCompile>
+    <Midl>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);USE_INSIDER_SDK</PreprocessorDefinitions>
+    </Midl>
+  </ItemDefinitionGroup>
+</Project>

localpackages/readme.md

@@ -0,0 +1 @@
+Use this directory to test nupkg packages locally before pushing to a remote feed.

tools/MakeAppxHelper.cmd

@@ -0,0 +1,52 @@
+@echo OFF
+SETLOCAL
+
+echo -- MakeAppxHelper.cmd %* --
+
+pushd %~dp0
+
+set PATH=%TFS_SourcesDirectory%\tools;%PATH%;%ProgramFiles(x86)%\Windows Kits\10\bin\x86
+set ExitCode=0
+set ERRORLEVEL=
+
+if "%1" NEQ "" (
+    set TFS_PLATFORM=%1
+)
+
+if "%2" NEQ "" (
+    set TFS_BUILDCONFIGURATION=%2
+)
+
+if "%TFS_PLATFORM%" EQU "" (
+	echo Expecting TFS_PLATFORM to be set
+	exit /b 1
+)
+
+if "%TFS_BUILDCONFIGURATION%" EQU "" (
+	echo Expecting TFS_BUILDCONFIGURATION to be set
+	exit /b 1
+)
+
+set BasePackageName=Microsoft.ProjectReunion
+
+echo BUILDOUTPUT_OVERRIDE = %BUILDOUTPUT_OVERRIDE%
+if "%BUILDOUTPUT_OVERRIDE%" == "" (
+	set InputDirectory=%CD%\..\BuildOutput\%TFS_BUILDCONFIGURATION%\%TFS_PLATFORM%\ProjectReunion_dll
+	set OutputDirectory=%CD%\..\BuildOutput\%TFS_BUILDCONFIGURATION%\%TFS_PLATFORM%\FrameworkPackage
+) else (
+	set InputDirectory=%BUILDOUTPUT_OVERRIDE%\ProjectReunion_dll
+	set OutputDirectory=%BUILDOUTPUT_OVERRIDE%\FrameworkPackage
+)
+
+call ..\build\FrameworkPackage\MakeFrameworkPackage.cmd -InputDirectory '%InputDirectory%' ^
+-OutputDirectory '%OutputDirectory%' -BasePackageName '%BasePackageName%' ^
+-Platform %TFS_PLATFORM% -Configuration %TFS_BUILDCONFIGURATION% ^
+ %3 %4 %5 %6 %7 %8 %9
+
+if %ERRORLEVEL% NEQ 0 (
+	@echo ##vso[task.logissue type=error;] MakeFrameworkPackage failed with exit code %ERRORLEVEL%
+	goto END
+)
+
+:END
+EXIT /B %ERRORLEVEL%