From c6032bff570b34e611b336575ae1db52d5aac866 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 26 Jan 2018 13:56:37 -0800
Subject: [PATCH 1/5] Updating submodule(s)

EntityFrameworkCore => 8df963b65d6c3d6922e43638558e055125c599b6
KestrelHttpServer => 8280c1b73ffe25e3c4492cf7f7aeeaca7098953a

[auto-updated: submodules]
---
 modules/EntityFrameworkCore | 2 +-
 modules/KestrelHttpServer   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index d32379241d..8df963b65d 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit d32379241d6d57b5d1721baf68e1495c939fb84b
+Subproject commit 8df963b65d6c3d6922e43638558e055125c599b6
diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer
index 4fd4fd9f41..8280c1b73f 160000
--- a/modules/KestrelHttpServer
+++ b/modules/KestrelHttpServer
@@ -1 +1 @@
-Subproject commit 4fd4fd9f4140b90734b179ea2fa9ddc9e89b0f69
+Subproject commit 8280c1b73ffe25e3c4492cf7f7aeeaca7098953a

From dd943d87c0bbf28a8bce62230702f1d8f6e28130 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 26 Jan 2018 23:56:07 +0000
Subject: [PATCH 2/5] Updating submodule(s)

Identity => 1c6b7e91613d232cde682f84b88d847955b0d214
Scaffolding => 62a0e4dba22de3701884966915101bc29fa487a2

[auto-updated: submodules]
---
 modules/Identity    | 2 +-
 modules/Scaffolding | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Identity b/modules/Identity
index d195866baa..1c6b7e9161 160000
--- a/modules/Identity
+++ b/modules/Identity
@@ -1 +1 @@
-Subproject commit d195866baa35d0fb3ee0ddf1e7353d19e0b04972
+Subproject commit 1c6b7e91613d232cde682f84b88d847955b0d214
diff --git a/modules/Scaffolding b/modules/Scaffolding
index 5deb96948f..62a0e4dba2 160000
--- a/modules/Scaffolding
+++ b/modules/Scaffolding
@@ -1 +1 @@
-Subproject commit 5deb96948f509245947a2195dd6a50dfe6e16b10
+Subproject commit 62a0e4dba22de3701884966915101bc29fa487a2

From b37880c98526665cee33d37e6e8b5e1aee7dc267 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 29 Jan 2018 11:11:51 -0800
Subject: [PATCH 3/5] Downgrade version of analyzers

---
 .../Microsoft.AspNetCore.Analyzers.csproj                   | 6 ++++++
 version.props                                               | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj b/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj
index 32c9b43a23..ec46fa5dac 100644
--- a/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj
+++ b/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj
@@ -19,6 +19,12 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>aspnetcore</PackageTags>
     <Description>Microsoft.AspNetCore.Analyzers</Description>
+
+    <VersionPrefix>$(ExperimentalVersionPrefix)</VersionPrefix>
+    <VersionSuffix>$(ExperimentalVersionSuffix)</VersionSuffix>
+    <PackageVersion>$(ExperimentalPackageVersion)</PackageVersion>
+    <VerifyVersion>false</VerifyVersion>
+
     <EnableApiCheck>false</EnableApiCheck>
   </PropertyGroup>
 
diff --git a/version.props b/version.props
index 026b488f23..f7b8853d01 100644
--- a/version.props
+++ b/version.props
@@ -2,9 +2,14 @@
   <PropertyGroup>
     <VersionPrefix>2.1.0</VersionPrefix>
     <VersionSuffix>preview1</VersionSuffix>
+    <ExperimentalVersionPrefix>0.1.0</ExperimentalVersionPrefix>
+    <ExperimentalVersionSuffix>alpha1</ExperimentalVersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
+    <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true'">$(VersionPrefix)-$(VersionSuffix)-final</ExperimentalPackageVersion>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+    <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true'">$(VersionPrefix)-$(VersionSuffix)-final</ExperimentalPackageVersion>
     <SharedFxCliBlobChannel>release/2.1</SharedFxCliBlobChannel>
   </PropertyGroup>
 </Project>

From f99426db159f28fa67731bb63aa4347d8ee1a2dd Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 29 Jan 2018 12:30:04 -0800
Subject: [PATCH 4/5] Fixup experimental version

---
 version.props | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/version.props b/version.props
index f7b8853d01..fefaa33964 100644
--- a/version.props
+++ b/version.props
@@ -6,10 +6,8 @@
     <ExperimentalVersionSuffix>alpha1</ExperimentalVersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
-    <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true'">$(VersionPrefix)-$(VersionSuffix)-final</ExperimentalPackageVersion>
+    <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true'">$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final</ExperimentalPackageVersion>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true'">$(VersionPrefix)-$(VersionSuffix)-final</ExperimentalPackageVersion>
     <SharedFxCliBlobChannel>release/2.1</SharedFxCliBlobChannel>
   </PropertyGroup>
 </Project>

From 9137604ea3a88bfef6e316d6d9f09e8bcd0f2a1c Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 29 Jan 2018 12:21:13 -0800
Subject: [PATCH 5/5] Add ShipInstaller=dotnetcli to non-package blobs

---
 build/Publish.targets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/Publish.targets b/build/Publish.targets
index 06da9463c1..34d9649dd1 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -69,30 +69,36 @@
       <!-- symbols -->
       <FilesToPublish Include="$(DependencyAssetsDir)$(SymbolsArchiveBaseFileName)-%(RuntimeSymbolsArchive.Identity)%(RuntimeSymbolsArchive.FileExt)" Condition=" '%(RuntimeSymbolsArchive.Identity)' != '' ">
         <RelativeBlobPath>$(BlobBasePath)$(SymbolsArchiveBaseFileName)-%(RuntimeSymbolsArchive.Identity)%(RuntimeSymbolsArchive.FileExt)</RelativeBlobPath>
+        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
       </FilesToPublish>
 
       <!-- Intermediate files passed on to the dotnet-CLI. -->
       <FilesToPublish Include="$(DependencyAssetsDir)$(PackageArchiveFileName)" >
         <RelativeBlobPath>$(BlobBasePath)$(PackageArchiveFileName)</RelativeBlobPath>
+        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
       </FilesToPublish>
 
       <FilesToPublish Include="$(DependencyAssetsDir)$(IntermediateInstallerBaseFileName)-%(IntermediateInstaller.Identity)%(IntermediateInstaller.FileExt)" Condition=" '%(IntermediateInstaller.Identity)' != '' ">
         <RelativeBlobPath>$(BlobBasePath)$(IntermediateInstallerBaseFileName)-%(IntermediateInstaller.Identity)%(IntermediateInstaller.FileExt)</RelativeBlobPath>
+        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
       </FilesToPublish>
 
       <FilesToPublish Include="$(BaseRuntimeVersionFile)">
         <RelativeBlobPath>$(BlobBasePath)$(BaseRuntimeVersionFileName)</RelativeBlobPath>
+        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
         <ContentType>text/plain</ContentType>
       </FilesToPublish>
 
       <!-- Archive installers -->
       <FilesToPublish Include="$(DependencyAssetsDir)$(InstallerBaseFileName)-%(NativeInstaller.Identity)%(NativeInstaller.FileExt)" Condition=" '%(NativeInstaller.FileExt)' != '' ">
         <RelativeBlobPath>$(BlobBasePath)$(InstallerBaseFileName)-%(NativeInstaller.Identity)%(NativeInstaller.FileExt)</RelativeBlobPath>
+        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
       </FilesToPublish>
 
       <!-- Support for README badges and dotnet-install.ps1/sh -->
       <FilesToPublish Include="$(DependencyAssetsDir)$(InstallerBaseFileName)-%(NativeInstaller.Identity)%(NativeInstaller.FileExt)" Condition=" '%(NativeInstaller.FileExt)' != '' ">
         <RelativeBlobPath>$(AliasBlobBasePath)$(InstallerAliasBaseFileName)-%(NativeInstaller.Identity)%(NativeInstaller.FileExt)</RelativeBlobPath>
+        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
         <Overwrite>true</Overwrite>
         <!-- These uploads duplicate the same blob in a separate location for README download links and to make dotnet-install.ps1/sh work when specifying -Channel. -->
         <IsDuplicateUpload>true</IsDuplicateUpload>
@@ -100,6 +106,7 @@
 
       <FilesToPublish Include="@(SharedFxVersionBadge)">
         <RelativeBlobPath>$(AliasBlobBasePath)%(SharedFxVersionBadge.FileName)%(SharedFxVersionBadge.Extension)</RelativeBlobPath>
+        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
         <CacheControl>no-cache, no-store, must-revalidate</CacheControl>
         <ContentType>image/svg+xml</ContentType>
         <Overwrite>true</Overwrite>
@@ -107,6 +114,7 @@
 
       <FilesToPublish Include="$(LatestRuntimeVersionFile)">
         <RelativeBlobPath>$(AliasBlobBasePath)$(LatestRuntimeVersionFileName)</RelativeBlobPath>
+        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
         <CacheControl>no-cache, no-store, must-revalidate</CacheControl>
         <ContentType>text/plain</ContentType>
         <Overwrite>true</Overwrite>
@@ -181,6 +189,7 @@
       <!-- Filter aliased artifacts to workaround dotnet/buildtools#1855 -->
       <FilesToPublishToTransport Include="@(FilesToPublish)"
         RelativeBlobPath="$(BlobFileRelativePathBase)%(FilesToPublish.RelativeBlobPath)"
+        ManifestArtifactData="%(FilesToPublish.ManifestArtifactData)"
         Condition=" '%(FilesToPublish.IsDuplicateUpload)' != 'true' " />
     </ItemGroup>