diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 0f680db2f..018a8b81c 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -59,6 +59,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4 build\Test.targets = build\Test.targets build\Version.props = build\Version.props build\VersionBadge.props = build\VersionBadge.props + build\DerivedHostMachineInfo.props = build\DerivedHostMachineInfo.props EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE}" diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 2d79fa46f..685df5297 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -32,7 +32,9 @@ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeVersion) - + runtime.version + $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) + $(HostOSName)$(Architecture) $(HostOSName) @@ -90,5 +92,12 @@ $(AspNetRuntimePackageStorePublishDirectory) + <_DownloadAndExtractItem Include="AspNetCoreSharedRuntimeVersionFile" + Condition="!Exists('$(AspNetCoreSharedRuntimeVersionFile)')"> + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreSharedRuntimeVersionFileName) + $(AspNetCoreSharedRuntimeVersionFile) + + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d93013b77..21e9c6d2f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview2-25407-01 + 2.0.0-preview3-25415-01 15.3.0-preview-000388-01 2.3.0-beta3-61814-09 1.6.0-beta2-25304 @@ -10,7 +10,7 @@ - 2.0.0-preview2-20170614-1 + 2.0.0-preview2-20170615-7 $(CLI_NETSDK_Version) 4.3.0-preview3-4168 @@ -23,8 +23,8 @@ 1.0.0-beta2-20170608-254 1.0.0-beta2-20170612-258 1.0.0-beta2-20170612-258 - 2.0.0-preview2-25407-01 - 2.0.0-preview2-25407-01 + 2.0.0-preview3-25415-01 + 2.0.0-preview3-25415-01 0.1.0-alpha-142 1.2.1-alpha-002133 0.2.0 diff --git a/build/DerivedHostMachineInfo.props b/build/DerivedHostMachineInfo.props new file mode 100644 index 000000000..d9dc94444 --- /dev/null +++ b/build/DerivedHostMachineInfo.props @@ -0,0 +1,7 @@ + + + true + true + true + + diff --git a/build/FileExtensions.props b/build/FileExtensions.props index fbbca63a7..21f8a68d2 100644 --- a/build/FileExtensions.props +++ b/build/FileExtensions.props @@ -1,20 +1,17 @@ - True - True - .zip .tar.gz .msi .pkg - .deb - .rpm + .deb + .rpm .exe $(InstallerExtension) - $(InstallerExtension) - $(InstallerExtension) + $(InstallerExtension) + $(InstallerExtension) lib diff --git a/build/Publish.targets b/build/Publish.targets index 77507cd46..d38175d64 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -26,9 +26,12 @@ - - - + + + diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 34e5e5978..2c917db52 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -99,6 +99,7 @@ @@ -14,6 +15,27 @@ + + + false + true + + + + + + + + + + + + + CommitHash="$(CommitHash)" + Coherent="$(Coherent)" /> + CommitHash="$(CommitHash)" + Coherent="$(Coherent)" />