Moving to new version for ASP .Net Core Runtime; accounting for the split of the Windows ZIP ASP .Net Core Runtime for x64/x86; trivial formating

build/BundledRuntimes.props

@@ -31,14 +31,15 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ASPNETCoreRuntimeInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/store</ASPNETCoreRuntimeInstallerBlobRootUrl>
+    <AspNetCoreRuntimeInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/store</AspNetCoreRuntimeInstallerBlobRootUrl>
 
-    <!-- Examples:    Build.RS.linux-preview1.zip    AspNetCorePackageStoreLibx64.wixlib   -->
-    <ASPNETCoreRuntimeInstallerArchiveFileName>Build.RS.$(OSName)-$(ASPNETCoreRuntimeFileNameVersionToken).zip</ASPNETCoreRuntimeInstallerArchiveFileName>
-    <ASPNETCoreRuntimeInstallerWixLibFileName Condition=" '$(OSName)' == 'win' ">AspNetCorePackageStoreLib$(Architecture).wixlib</ASPNETCoreRuntimeInstallerWixLibFileName>
+    <!-- Examples:    Build.RS.linux-preview1.zip    Build.RS.winx86-preview1.zip    AspNetCorePackageStoreLibx64.wixlib   -->
+    <AspNetCoreRuntimeInstallerArchiveFileName>Build.RS.$(OSName)-$(AspNetCoreRuntimeFileNameVersionToken).zip</AspNetCoreRuntimeInstallerArchiveFileName>
+    <AspNetCoreRuntimeInstallerArchiveFileName Condition=" '$(OSName)' == 'win' ">Build.RS.$(OSName)$(Architecture)-$(AspNetCoreRuntimeFileNameVersionToken).zip</AspNetCoreRuntimeInstallerArchiveFileName>
+    <AspNetCoreRuntimeInstallerWixLibFileName Condition=" '$(OSName)' == 'win' ">AspNetCorePackageStoreLib$(Architecture).wixlib</AspNetCoreRuntimeInstallerWixLibFileName>
 
-    <ASPNETCoreRuntimeInstallerArchiveFile>$(PackagesDirectory)/$(ASPNETCoreRuntimeInstallerArchiveFileName)</ASPNETCoreRuntimeInstallerArchiveFile>
-    <ASPNETCoreRuntimeInstallerWixLibFile Condition=" '$(ASPNETCoreRuntimeInstallerWixLibFileName)' != '' ">$(PackagesDirectory)/$(ASPNETCoreRuntimeInstallerWixLibFileName)</ASPNETCoreRuntimeInstallerWixLibFile>
+    <AspNetCoreRuntimeInstallerArchiveFile>$(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName)</AspNetCoreRuntimeInstallerArchiveFile>
+    <AspNetCoreRuntimeInstallerWixLibFile Condition=" '$(AspNetCoreRuntimeInstallerWixLibFileName)' != '' ">$(PackagesDirectory)/$(AspNetCoreRuntimeInstallerWixLibFileName)</AspNetCoreRuntimeInstallerWixLibFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -60,27 +61,27 @@
                              Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''">
       <Url>$(CoreSetupInstallerBlobRootUrl)/$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName)</Url>
       <DownloadFileName>$(DownloadedSharedHostInstallerFile)</DownloadFileName>
-      <ExtractDestintation></ExtractDestintation>
+      <ExtractDestination></ExtractDestination>
     </_DownloadAndExtractItem>
 
     <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile"
                              Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
       <Url>$(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)</Url>
       <DownloadFileName>$(DownloadedHostFxrInstallerFile)</DownloadFileName>
-      <ExtractDestintation></ExtractDestintation>
+      <ExtractDestination></ExtractDestination>
     </_DownloadAndExtractItem>
 
-  <_DownloadAndExtractItem Include="ASPNETCoreRuntimeInstallerWixLibFile"
-                           Condition=" '$(ASPNETCoreRuntimeInstallerWixLibFile)' != '' And !Exists('$(ASPNETCoreRuntimeInstallerWixLibFile)')">
-      <Url>$(ASPNETCoreRuntimeInstallerBlobRootUrl)/$(ASPNETCoreRuntimeVersion)/$(ASPNETCoreRuntimeInstallerWixLibFileName)</Url>
-      <DownloadFileName>$(ASPNETCoreRuntimeInstallerWixLibFile)</DownloadFileName>
+  <_DownloadAndExtractItem Include="AspNetCoreRuntimeInstallerWixLibFile"
+                           Condition=" '$(AspNetCoreRuntimeInstallerWixLibFile)' != '' And !Exists('$(AspNetCoreRuntimeInstallerWixLibFile)')">
+      <Url>$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeVersion)/$(AspNetCoreRuntimeInstallerWixLibFileName)</Url>
+      <DownloadFileName>$(AspNetCoreRuntimeInstallerWixLibFile)</DownloadFileName>
       <ExtractDestination></ExtractDestination>
   </_DownloadAndExtractItem>
 
-  <_DownloadAndExtractItem Include="ASPNETCoreRuntimeInstallerArchiveFile"
-                           Condition="!Exists('$(ASPNETCoreRuntimeInstallerArchiveFile)')">
-      <Url>$(ASPNETCoreRuntimeInstallerBlobRootUrl)/$(ASPNETCoreRuntimeVersion)/$(ASPNETCoreRuntimeInstallerArchiveFileName)</Url>
-      <DownloadFileName>$(ASPNETCoreRuntimeInstallerArchiveFile)</DownloadFileName>
+  <_DownloadAndExtractItem Include="AspNetCoreRuntimeInstallerArchiveFile"
+                           Condition="!Exists('$(AspNetCoreRuntimeInstallerArchiveFile)')">
+      <Url>$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeVersion)/$(AspNetCoreRuntimeInstallerArchiveFileName)</Url>
+      <DownloadFileName>$(AspNetCoreRuntimeInstallerArchiveFile)</DownloadFileName>
       <ExtractDestination>$(AspNetRuntimePackageStorePublishDirectory)</ExtractDestination>
   </_DownloadAndExtractItem>
 

build/DependencyVersions.props

@@ -17,10 +17,10 @@
     <PlatformAbstractionsVersion>2.0.0-preview1-002101</PlatformAbstractionsVersion>
     <DependencyModelVersion>2.0.0-preview1-002101</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
-    <ASPNETCoreRuntimeVersion>2.0.0-preview1-30</ASPNETCoreRuntimeVersion>
-    <ASPNETCoreRuntimeFileNameVersionToken>preview1</ASPNETCoreRuntimeFileNameVersionToken>
+    <AspNetCoreRuntimeVersion>2.0.0-preview1-34</AspNetCoreRuntimeVersion>
+    <AspNetCoreRuntimeFileNameVersionToken>preview1</AspNetCoreRuntimeFileNameVersionToken>
 
-  </PropertyGroup>
+</PropertyGroup>
 
   <!-- infrastructure and test only dependencies -->
   <PropertyGroup>

build/OutputDirectories.props

@@ -10,7 +10,7 @@
       <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
       <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
       <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
-      <AspNetRuntimePackageStorePublishDirectory>$(IntermediateDirectory)/ASPNETCoreRuntimeStore</AspNetRuntimePackageStorePublishDirectory>
+      <AspNetRuntimePackageStorePublishDirectory>$(IntermediateDirectory)/AspNetCoreRuntimeStore</AspNetRuntimePackageStorePublishDirectory>
       <BackwardsCompatibleSharedFrameworksPublishDirectory>$(IntermediateDirectory)/backwardsCompatibleSharedFrameworksPublish</BackwardsCompatibleSharedFrameworksPublishDirectory>
       <TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
       <DotnetInOutputDirectory>$(OutputDirectory)/dotnet$(ExeExtension)</DotnetInOutputDirectory>