Build Roslyn_Preview.zip from a project

Roslyn.sln

@@ -395,6 +395,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PortableFacades.Setup", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Compilers.Setup", "src\Setup\DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.Setup.csproj", "{03607817-6800-40B6-BEAA-D6F437CD62B7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Installer.Package", "src\Setup\Installer\Installer.Package.csproj", "{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4
@@ -1056,6 +1058,10 @@ Global
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1244,6 +1250,7 @@ Global
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
 		{952808C5-799A-4CAA-964C-2AA78458CEC7} = {BE25E872-1667-4649-9D19-96B83E75A44E}
 		{03607817-6800-40B6-BEAA-D6F437CD62B7} = {BE25E872-1667-4649-9D19-96B83E75A44E}
+		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5} = {BE25E872-1667-4649-9D19-96B83E75A44E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}

build/scripts/build.ps1

@@ -252,7 +252,6 @@ function Build-Artifacts() {
 
     if ($build -and $pack -and (-not $buildCoreClr)) {
         Build-InsertionItems
-        Build-Installer
     }
 
     if ($cibuild) {
@@ -274,55 +273,6 @@ function Build-InsertionItems() {
     }
 }
 
-function Build-Installer () {
-    ## Copying Artifacts
-    $installerDir = Join-Path $configDir "Installer"
-    if (Test-Path $installerDir) {
-        Remove-Item -Path $installerDir -Recurse -Force
-    }
-    Create-Directory $installerDir
-
-    $intermidateDirectory = Join-Path $env:TEMP "InstallerTemp"
-    if (Test-Path $intermidateDirectory) {
-        Remove-Item -Path $intermidateDirectory -Recurse -Force
-    }
-    Create-Directory $intermidateDirectory
-
-    ## Copying VsixExpInstaller.exe
-    $vsixExpInstallerDir = Get-PackageDir "RoslynTools.VSIXExpInstaller"
-    $vsixExpInstallerExe = Join-Path $vsixExpInstallerDir "tools\*"
-    $vsixExpInstallerExeDestination = Join-Path $intermidateDirectory "tools\vsixexpinstaller"
-    Create-Directory $vsixExpInstallerExeDestination
-    Copy-Item $vsixExpInstallerExe -Destination $vsixExpInstallerExeDestination -Recurse
-
-    ## Copying VsWhere.exe
-    $vswhere = Join-Path (Ensure-BasicTool "vswhere") "tools\*"
-    $vswhereDestination = Join-Path $intermidateDirectory "tools\vswhere"
-    Create-Directory $vswhereDestination
-    Copy-Item $vswhere -Destination $vswhereDestination -Recurse
-
-    ## Copying scripts
-    $installerScriptsFolder = Join-Path $repoDir "src\Setup\InstallerScripts\*.bat"
-    Copy-Item $installerScriptsFolder -Destination $intermidateDirectory -Recurse
-
-    $installerScriptsFolder = Join-Path $repoDir "src\Setup\InstallerScripts\tools\*.ps1"
-    $intermidatePowershellScriptsDirectory = Join-Path $intermidateDirectory "tools"
-    Copy-Item $installerScriptsFolder -Destination $intermidatePowershellScriptsDirectory -Recurse
-
-    ## Copying VSIXes
-    $vsixDirDestination = Join-Path $intermidateDirectory "vsix"
-    if (-not (Test-Path $vsixDirDestination)) {
-        New-Item -ItemType Directory -Force -Path $vsixDirDestination
-    }
-    $RoslynDeploymentVsix = Join-Path $vsSetupDir "RoslynDeployment.vsix"
-    Copy-Item $RoslynDeploymentVsix -Destination $vsixDirDestination
-
-    #  Zip Folder
-    $installerZip = Join-Path $installerDir "Roslyn_Preview"
-    $intermidateDirectory = Join-Path $intermidateDirectory "*"
-    Compress-Archive -Path $intermidateDirectory -DestinationPath $installerZip
-}
-
 function Build-CheckLocStatus() {
     Run-MSBuild "Roslyn.sln" "/t:CheckLocStatus" -logFileName "RoslynCheckLocStatus"
 }

src/Setup/Installer/Directory.Build.targets

+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+  <Import Project="..\..\..\Directory.Build.targets" />
+  <Import Project="..\..\..\build\Targets\PackageProject.targets" Condition="'$(TargetFramework)' != ''"/>
+</Project>
\ No newline at end of file

src/Setup/Installer/Installer.Package.csproj

+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net46</TargetFramework>
+    <RoslynProjectType>Custom</RoslynProjectType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="vswhere" Version="$(vswhereVersion)" />
+    <PackageReference Include="RoslynTools.VSIXExpInstaller" Version="$(RoslynToolsVSIXExpInstallerVersion)" />
+    <ProjectReference Include="..\..\Deployment\RoslynDeployment.csproj"/>
+  </ItemGroup>
+
+  <Target Name="_CalculateInputsOutputs">
+    <PropertyGroup>
+      <_InstallerDir>$(ArtifactsDir)Installer\</_InstallerDir>
+      <_InstallerFilePath>$(_InstallerDir)Roslyn_Preview.zip</_InstallerFilePath>
+      <_ZipDir>$(IntermediateOutputPath)Zip\</_ZipDir>
+      <_DeploymentVsixPath>$(VisualStudioSetupOutputPath)RoslynDeployment.vsix</_DeploymentVsixPath>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="_GenerateZip" 
+          AfterTargets="Pack"
+          DependsOnTargets="_CalculateInputsOutputs;ResolveProjectReferences"
+          Inputs="$(MSBuildAllProjects);$(_DeploymentVsixPath)"
+          Outputs="$(_InstallerFilePath)">
+    <ItemGroup>
+      <_Files Include="$(MSBuildProjectDirectory)\tools\*.*" TargetDir="tools"/>
+      <_Files Include="$(MSBuildProjectDirectory)\scripts\*.*" TargetDir=""/>
+      <_Files Include="$(NuGetPackageRoot)vswhere\$(vswhereVersion)\tools\*.*" TargetDir="tools\vswhere"/>
+      <_Files Include="$(NuGetPackageRoot)roslyntools.vsixexpinstaller\$(RoslynToolsVSIXExpInstallerVersion)\tools\*.*" TargetDir="tools\vsixexpinstaller"/>
+      <_Files Include="$(_DeploymentVsixPath)" TargetDir="vsix"/>
+    </ItemGroup>
+
+    <RemoveDir Directories="$(_ZipDir)" />
+    <Copy SourceFiles="%(_Files.Identity)" DestinationFolder="$(_ZipDir)%(_Files.TargetDir)" SkipUnchangedFiles="true" />
+
+    <MakeDir Directories="$(_InstallerDir)" />
+    <ZipDirectory SourceDirectory="$(_ZipDir)" DestinationFile="$(_InstallerFilePath)" Overwrite="true"/>
+    
+    <ItemGroup>
+      <FileWrites Include="$(_InstallerFilePath)"/>
+    </ItemGroup>
+  </Target>
+</Project>
\ No newline at end of file