Build changes

Author: stefansjfw

BuildAll.ps1

@@ -18,7 +18,7 @@ Main branch points to the external feed.
 
 Param(
     [string]$PackageVersion = "1.1.1.1",
-    [string]$Platform = "x64",
+    [string]$Platform = "x86",
     [string]$Configuration = "Release",
     [string]$AzureBuildStep = "all",
     [string]$OutputDirectory = (Split-Path $MyInvocation.MyCommand.Path) + "\BuildOutput",

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj.filters

@@ -84,4 +84,7 @@
   <ItemGroup>
     <ResourceCompile Include="Microsoft.Windows.ApplicationModel.Resources.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
+  </ItemGroup>
 </Project>

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/Properties/AssemblyInfo.cs

@@ -15,6 +15,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyMetadata("TargetPlatform","UAP")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.7")]
+[assembly: AssemblyFileVersion("1.7")]
 [assembly: ComVisible(false)]

eng/common/VersionInfo/AssemblyInfo.cs

@@ -1,10 +1,3 @@
-// WARNING: the values in the AssemblyInfo file are defaults for use in dev-loop.
-// This file is meant to be overwritten by GenerateVersionInfo.ps1
-// Please modify the generation script in GenerateVersionInfo.ps1 to change any fields or values.
-
-// Copyright (c) Microsoft Corporation and Contributors.
-// Licensed under the MIT License.
-
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -13,7 +6,7 @@
 [assembly: AssemblyProduct("Windows App SDK")]
 [assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]
 
-[assembly: AssemblyVersion("0.0")]
-[assembly: AssemblyFileVersion("0.0")]
+[assembly: AssemblyVersion("1.7")]
+[assembly: AssemblyFileVersion("1.7")]
 
 [assembly: AssemblyMetadata("IsTrimmable", "True")]

eng/common/VersionInfo/AssemblyInfo.ver

@@ -1,7 +1,3 @@
-// WARNING: the values in the AssemblyInfo file are defaults for use in dev-loop.
-// This file is meant to be overwritten by GenerateVersionInfo.ps1
-// Please modify the generation script in GenerateVersionInfo.ps1 to change any fields or values.
-
 // Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
@@ -10,11 +6,11 @@
 #define STR2(a,b)       STR1(a) DELIM STR1(b)
 
 #ifndef WINDOWSAPPSDK_RELEASE_MAJOR
-#define WINDOWSAPPSDK_RELEASE_MAJOR     0
+#define WINDOWSAPPSDK_RELEASE_MAJOR     1
 #endif
 
 #ifndef WINDOWSAPPSDK_RELEASE_MINOR
-#define WINDOWSAPPSDK_RELEASE_MINOR     0
+#define WINDOWSAPPSDK_RELEASE_MINOR     7
 #endif
 
 #define WINDOWSAPPSDK_PRODUCT_VERSION           WINDOWSAPPSDK_RELEASE_MAJOR, WINDOWSAPPSDK_RELEASE_MINOR