Merge 'master' into dev/arcade-migration

# Conflicts: # build.proj # eng/Versions.props Commit migrated from dotnet/core-setup@457e30a
javidhasanzade · Jul 2, 2019 · da4a19a · da4a19a
2 parents dec26d5 + a420d0c
commit da4a19a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/installer/pkg/packaging/installers.proj b/src/installer/pkg/packaging/installers.proj
@@ -220,7 +220,7 @@
 
   <Target Name="GenerateVSNugetPackages"
           Condition="'$(OS)' == 'Windows_NT' AND '$(TargetArchitecture)' != 'arm' AND '$(TargetArchitecture)' != 'arm64'"
-          DependsOnTargets="SetupVSNugetPackages;GenerateInstallers;GenerateProjectInstallers;GenerateCombinedInstallers"
+          DependsOnTargets="SetupVSNugetPackages"
           Inputs="@(SdkMsiComponent->'%(MsiInstallerFile)');
                     $(NuSpecFile);
                     $(GenerateNupkgPowershellScript)"

diff --git a/tools-local/regenerate-readme-table.proj b/tools-local/regenerate-readme-table.proj
@@ -12,8 +12,6 @@
       <Branches Include="Release/3.0.X" Abbr="3.0.X" />
       <Branches Include="Release/2.2.X" Abbr="2.2.X" />
       <Branches Include="Release/2.1.X" Abbr="2.1.X" />
-      <Branches Include="Release/1.1.X" Abbr="1.1.X" />
-      <Branches Include="Release/1.0.X" Abbr="preview" />
 
       <Platforms Include="Windows (x64)" Abbr="win-x64" />
       <Platforms Include="Windows (x86)" Abbr="win-x86" />
@@ -32,8 +30,6 @@
       <Platforms Include="CentOS 7 (x64)" Abbr="centos-7" />
       <Platforms Include="RHEL 6" Abbr="rhel-6" />
       <Platforms Include="RHEL 7.2 (x64)" Abbr="rhel7" />
-      <Platforms Include="Fedora 23 (x64)" Abbr="fedora-23" />
-      <Platforms Include="Fedora 24 (x64)" Abbr="fedora-24" />
       <Platforms Include="Fedora 27 (x64)" Abbr="fedora-27" />
       <Platforms Include="SLES 12 (x64)" Abbr="sles-12" />
       <Platforms Include="OpenSUSE 42 (x64)" Abbr="OpenSUSE-42" />