diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 9fa2244f7..ada643237 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestPackages", "TestPackage
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4-BC0F-443B-8ADF-691321F10108}"
ProjectSection(SolutionItems) = preProject
+ build\AzureInfo.props = build\AzureInfo.props
build\Branding.props = build\Branding.props
build\BranchInfo.props = build\BranchInfo.props
build\BuildDefaults.props = build\BuildDefaults.props
@@ -44,6 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
build\InitRepo.props = build\InitRepo.props
build\InitRepo.targets = build\InitRepo.targets
build\InputDirectories.props = build\InputDirectories.props
+ build\InstallerInfo.props = build\InstallerInfo.props
build\ProjectsToPublish.props = build\ProjectsToPublish.props
build\OutputDirectories.props = build\OutputDirectories.props
build\Package.targets = build\Package.targets
@@ -88,6 +90,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B1
build\publish\Badge.targets = build\publish\Badge.targets
build\publish\Checksum.targets = build\publish\Checksum.targets
build\publish\PublishContent.targets = build\publish\PublishContent.targets
+ build\publish\PublishDebian.targets = build\publish\PublishDebian.targets
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}"
diff --git a/build/AzureInfo.props b/build/AzureInfo.props
new file mode 100644
index 000000000..0e8cf5104
--- /dev/null
+++ b/build/AzureInfo.props
@@ -0,0 +1,14 @@
+
+
+ Sdk
+ $(ARTIFACT_STORAGE_CONTAINER)
+ dotnet
+ $(ARTIFACT_STORAGE_KEY)
+ $(ARTIFACT_STORAGE_ACCOUNT)
+ dotnetcli
+ https://$(ArtifactCloudDropAccountName).blob.core.windows.net/$(ArtifactContainerName)
+ $(CHECKSUM_STORAGE_CONTAINER)
+ $(CHECKSUM_STORAGE_KEY)
+ $(CHECKSUM_STORAGE_ACCOUNT)
+
+
diff --git a/build/InstallerInfo.props b/build/InstallerInfo.props
new file mode 100644
index 000000000..5c8c5441a
--- /dev/null
+++ b/build/InstallerInfo.props
@@ -0,0 +1,6 @@
+
+
+ $(PackagesDirectory)
+ $(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)
+
+
diff --git a/build/Publish.targets b/build/Publish.targets
index 72811e068..77507cd46 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -2,6 +2,7 @@
+
@@ -15,8 +16,7 @@
-
-
- Sdk
- $(ARTIFACT_STORAGE_CONTAINER)
- dotnet
- $(ARTIFACT_STORAGE_KEY)
- $(ARTIFACT_STORAGE_ACCOUNT)
- dotnetcli
- https://$(ArtifactCloudDropAccountName).blob.core.windows.net/$(ArtifactContainerName)
- $(CHECKSUM_STORAGE_CONTAINER)
- $(CHECKSUM_STORAGE_KEY)
- $(CHECKSUM_STORAGE_ACCOUNT)
-
-
-
@@ -53,36 +38,6 @@
-
-
-
-
-
-
-
-
-
-
- $(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)
- $(SdkDebianIntermediateDirectory)/package_upload.json
- 1
-
-
- {
- "name":"$(SdkDebianPackageName)",
- "version":"$(NugetVersion)-$(DebianRevisionNumber)",
- "repositoryId":"$(REPO_ID)",
- "sourceUrl": "$(SdkDebianUploadUrl)"
- }
-
-
-
-
-
-
-
-
-
diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets
index 7b51073ee..a70316354 100644
--- a/build/compile/LzmaArchive.targets
+++ b/build/compile/LzmaArchive.targets
@@ -27,7 +27,6 @@
@@ -108,7 +107,7 @@
+ DependsOnTargets="Prepare">
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index ca94cf99f..ee5c9bd48 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -1,6 +1,12 @@
-
+ $(SdkVersion)
+ dotnet-dev-$(SdkDebianPackageVersion)
+ $(IntermediateDirectory)/debian/sdk
+
+
+
@@ -33,8 +39,6 @@
- $(SdkVersion)
- dotnet-dev-$(SdkDebianPackageVersion)
$(SharedFrameworkVersion)
dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFxDebianPackageVersion)
$(SharedFxDebianPackageName.ToLower())
@@ -65,10 +69,6 @@
- $(PackagesDirectory)
- $(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)
-
- $(IntermediateDirectory)/debian/sdk
$(SdkDebianIntermediateDirectory)/deb-tool-output
$(SdkDebianIntermediateDirectory)/debian-testResults.xml
diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index 583e1f240..af6c5e29b 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -12,15 +12,12 @@
- $(PackagesDirectory)
-
$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)-engine.exe
$(RepoRoot)/packaging/windows/clisdk/generatemsi.ps1
$(RepoRoot)/packaging/windows/clisdk/generatebundle.ps1
$(RepoRoot)/packaging/windows/clisdk/generatenupkg.ps1
- $(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)
$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)
$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec
$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg
diff --git a/build/package/Installer.PKG.targets b/build/package/Installer.PKG.targets
index 22416f080..96873d6c6 100644
--- a/build/package/Installer.PKG.targets
+++ b/build/package/Installer.PKG.targets
@@ -2,10 +2,8 @@
- $(PackagesDirectory)
$(IntermediateDirectory)/pkgs/$(SdkVersion)
- $(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)
$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)
diff --git a/build/publish/PublishDebian.targets b/build/publish/PublishDebian.targets
new file mode 100644
index 000000000..f7d731218
--- /dev/null
+++ b/build/publish/PublishDebian.targets
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+ $(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)
+ $(SdkDebianIntermediateDirectory)/package_upload.json
+ 1
+
+
+ {
+ "name":"$(SdkDebianPackageName)",
+ "version":"$(NugetVersion)-$(DebianRevisionNumber)",
+ "repositoryId":"$(REPO_ID)",
+ "sourceUrl": "$(SdkDebianUploadUrl)"
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dir.props b/dir.props
index 144c12123..2e19168c2 100644
--- a/dir.props
+++ b/dir.props
@@ -2,6 +2,15 @@
$(MSBuildThisFileDirectory)
+
+ $(NUGET_PACKAGES)
+ $(RepoRoot)/.nuget/packages
+
+ $(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll
+
+ true
+
+ netcoreapp2.0
@@ -25,17 +34,8 @@
-
-
- $(NUGET_PACKAGES)
- $(RepoRoot)/.nuget/packages
-
- $(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll
-
- true
-
- netcoreapp2.0
-
+
+