diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index fa47e7ccf..073ed9822 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.0 +VisualStudioVersion = 15.0.26228.9 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject @@ -27,12 +27,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4 build\BranchInfo.props = build\BranchInfo.props build\Branding.props = build\Branding.props build\BuildDefaults.props = build\BuildDefaults.props + build\BuildInfo.targets = build\BuildInfo.targets build\BundledRuntimes.props = build\BundledRuntimes.props build\BundledSdks.proj = build\BundledSdks.proj build\BundledSdks.props = build\BundledSdks.props build\BundledTemplates.proj = build\BundledTemplates.proj build\BundledTemplates.props = build\BundledTemplates.props build\BundledTools.props = build\BundledTools.props + build\BundledVersions.targets = build\BundledVersions.targets build\Compile.targets = build\Compile.targets build\CrossGen.props = build\CrossGen.props build\DependencyVersions.props = build\DependencyVersions.props @@ -43,6 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4 build\InitRepo.targets = build\InitRepo.targets build\InputDirectories.props = build\InputDirectories.props build\InstallerInfo.props = build\InstallerInfo.props + build\Microsoft.DotNet.Cli.tasks = build\Microsoft.DotNet.Cli.tasks build\MSBuildExtensions.props = build\MSBuildExtensions.props build\OutputDirectories.props = build\OutputDirectories.props build\Package.targets = build\Package.targets @@ -50,9 +53,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4 build\ProjectsToPublish.props = build\ProjectsToPublish.props build\Publish.targets = build\Publish.targets build\Run.targets = build\Run.targets + build\sdks\sdks.csproj = build\sdks\sdks.csproj build\Signing.proj = build\Signing.proj build\Stage0.props = build\Stage0.props - build\tasks = build\tasks build\Test.targets = build\Test.targets build\Version.props = build\Version.props build\VersionBadge.props = build\VersionBadge.props @@ -209,6 +212,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Sln.In EndProject Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "dotnet-cache.Tests", "test\dotnet-cache.Tests\dotnet-cache.Tests.csproj", "{CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk", "sdk", "{3275D006-54C8-4C64-A537-B9941C5D2F0C}" + ProjectSection(SolutionItems) = preProject + build\sdks\sdks.csproj = build\sdks\sdks.csproj + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{DE4D1AEB-871B-4E7C-945A-453F9A490C06}" + ProjectSection(SolutionItems) = preProject + build\templates\templates.csproj = build\templates\templates.csproj + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1503,7 +1516,12 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {1AB5B24B-B317-4142-A5D1-A6E84F15BA34} = {ADA7052B-884B-4776-8B8D-D04191D0AA70} + {FD7D515A-D10F-4F49-B8AE-21CF7ED071AE} = {89905EC4-BC0F-443B-8ADF-691321F10108} + {8E3354BD-827F-41B7-9EE6-6BE1F1EDD8E9} = {89905EC4-BC0F-443B-8ADF-691321F10108} + {FF498306-2DE2-47F6-8C35-3CF0589CF2B8} = {89905EC4-BC0F-443B-8ADF-691321F10108} + {27B12960-ABB0-4903-9C60-5E9157E659C8} = {89905EC4-BC0F-443B-8ADF-691321F10108} {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} + {2BDC1BC2-867E-47C0-BAD0-ADE897F07F78} = {89905EC4-BC0F-443B-8ADF-691321F10108} {48A62BA4-D798-46A2-AB49-8A8471CF8165} = {1AB5B24B-B317-4142-A5D1-A6E84F15BA34} {7C3D62C6-1D71-4C45-872F-7583F2AB304A} = {1AB5B24B-B317-4142-A5D1-A6E84F15BA34} {79B4932C-3D57-494B-95AF-E5624F9D2F01} = {1AB5B24B-B317-4142-A5D1-A6E84F15BA34} @@ -1558,5 +1576,7 @@ Global {C98C7C2E-2C29-4A40-958C-60561ED77791} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D} = {FF498306-2DE2-47F6-8C35-3CF0589CF2B8} + {3275D006-54C8-4C64-A537-B9941C5D2F0C} = {89905EC4-BC0F-443B-8ADF-691321F10108} + {DE4D1AEB-871B-4E7C-945A-453F9A490C06} = {89905EC4-BC0F-443B-8ADF-691321F10108} EndGlobalSection EndGlobal diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props index 463e421fc..c78a5c0d9 100644 --- a/build/BuildDefaults.props +++ b/build/BuildDefaults.props @@ -7,5 +7,6 @@ false true false + true diff --git a/build/BuildInfo.targets b/build/BuildInfo.targets index 6df905670..6972a864e 100644 --- a/build/BuildInfo.targets +++ b/build/BuildInfo.targets @@ -5,12 +5,14 @@ + $(HostRid) x64 $(HostOSName) + $(HostOSPlatform) <Project ToolsVersion="15.0"> @@ -18,6 +20,7 @@ <Rid>$(Rid)</Rid> <Architecture>$(Architecture)</Architecture> <OSName>$(OSName)</OSName> + <OSPlatform>$(OSPlatform)</OSPlatform> </PropertyGroup> </Project> diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index a7d91de3d..7122b7c8f 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -1,117 +1,120 @@ - + + + dotnet-host-$(ProductMonikerRid).$(SharedHostVersion)$(InstallerExtension) + $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) - - dotnet-host-$(ProductMonikerRid).$(SharedHostVersion)$(InstallerExtension) - $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) + dotnet-hostfxr-$(ProductMonikerRid).$(HostFxrVersion)$(InstallerExtension) + $(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName) - dotnet-hostfxr-$(ProductMonikerRid).$(HostFxrVersion)$(InstallerExtension) - $(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName) + dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerExtension) + $(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName) - dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerExtension) - $(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName) + + $(ProductMonikerRid) + linux-x64 + dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchiveExtension) + - dotnet-$(ProductMonikerRid).$(SharedFrameworkVersion)$(ArchiveExtension) - + + + release/1.1.0 + 1.1.1 + 1.1.0 + 1.1.0 - - - release/1.1.0 - 1.1.1 - 1.1.0 - 1.1.0 + + dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension) + $(PackagesDirectory)/$(AdditionalDownloadedSharedHostInstallerFileName) - - dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension) - $(PackagesDirectory)/$(AdditionalDownloadedSharedHostInstallerFileName) + dotnet-hostfxr-$(ProductMonikerRid).$(AdditionalHostFxrVersion)$(InstallerExtension) + $(PackagesDirectory)/$(AdditionalDownloadedHostFxrInstallerFileName) - dotnet-hostfxr-$(ProductMonikerRid).$(AdditionalHostFxrVersion)$(InstallerExtension) - $(PackagesDirectory)/$(AdditionalDownloadedHostFxrInstallerFileName) + dotnet-sharedframework-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(InstallerExtension) + $(PackagesDirectory)/$(AdditionalDownloadedSharedFrameworkInstallerFileName) - dotnet-sharedframework-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(InstallerExtension) - $(PackagesDirectory)/$(AdditionalDownloadedSharedFrameworkInstallerFileName) + dotnet-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(ArchiveExtension) + - dotnet-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(ArchiveExtension) - + + master + https://dotnetcli.azureedge.net/dotnet/ + $(CoreSetupBlobRootUrl)$(CoreSetupChannel) + $(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion) + $(CoreSetupBlobRootUrlWithChannel)/Installers + $(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion) + $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive + - - master - https://dotnetcli.azureedge.net/dotnet/ - $(CoreSetupBlobRootUrl)$(CoreSetupChannel) - $(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion) - $(CoreSetupBlobRootUrlWithChannel)/Installers - $(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion) - $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive - + + <_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive" + Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')"> + $(SharedFrameworkArchiveBlobRootUrl)/$(CombinedFrameworkHostCompressedFileName) + $(CombinedSharedHostAndFrameworkArchive) + $(SharedFrameworkPublishDirectory) + - - <_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive" - Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')"> - $(SharedFrameworkArchiveBlobRootUrl)/$(CombinedFrameworkHostCompressedFileName) - $(CombinedSharedHostAndFrameworkArchive) - $(SharedFrameworkPublishDirectory) - + <_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile" + Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> + $(CoreSetupInstallerBlobRootUrl)/$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName) + $(DownloadedSharedFrameworkInstallerFile) + + - <_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile" - Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupInstallerBlobRootUrl)/$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName) - $(DownloadedSharedFrameworkInstallerFile) - - + <_DownloadAndExtractItem Include="DownloadedSharedHostInstallerFile" + Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> + $(CoreSetupInstallerBlobRootUrl)/$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName) + $(DownloadedSharedHostInstallerFile) + + - <_DownloadAndExtractItem Include="DownloadedSharedHostInstallerFile" - Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupInstallerBlobRootUrl)/$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName) - $(DownloadedSharedHostInstallerFile) - - + <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile" + Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> + $(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName) + $(DownloadedHostFxrInstallerFile) + + + - <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile" - Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName) - $(DownloadedHostFxrInstallerFile) - - - + + + $(CoreSetupBlobRootUrl)$(AdditionalCoreSetupChannel) + $(AdditionalCoreSetupBlobRootUrlWithChannel)/Binaries/$(AdditionalSharedFrameworkVersion) + $(AdditionalCoreSetupBlobRootUrlWithChannel)/Installers + $(IntermediateDirectory)/coreSetupDownload/$(AdditionalSharedFrameworkVersion) + $(AdditionalCoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive + - - - $(CoreSetupBlobRootUrl)$(AdditionalCoreSetupChannel) - $(AdditionalCoreSetupBlobRootUrlWithChannel)/Binaries/$(AdditionalSharedFrameworkVersion) - $(AdditionalCoreSetupBlobRootUrlWithChannel)/Installers - $(IntermediateDirectory)/coreSetupDownload/$(AdditionalSharedFrameworkVersion) - $(AdditionalCoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive - + + <_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive" + Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')"> + $(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName) + $(AdditionalCombinedSharedHostAndFrameworkArchive) + $(SharedFrameworkPublishDirectory) + + False + - - <_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive" - Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')"> - $(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName) - $(AdditionalCombinedSharedHostAndFrameworkArchive) - $(SharedFrameworkPublishDirectory) - - False - + <_DownloadAndExtractItem Include="AdditionalDownloadedSharedFrameworkInstallerFile" + Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> + $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName) + $(AdditionalDownloadedSharedFrameworkInstallerFile) + + - <_DownloadAndExtractItem Include="AdditionalDownloadedSharedFrameworkInstallerFile" - Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName) - $(AdditionalDownloadedSharedFrameworkInstallerFile) - - + <_DownloadAndExtractItem Include="AdditionalDownloadedSharedHostInstallerFile" + Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> + $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName) + $(AdditionalDownloadedSharedHostInstallerFile) + + - <_DownloadAndExtractItem Include="AdditionalDownloadedSharedHostInstallerFile" - Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName) - $(AdditionalDownloadedSharedHostInstallerFile) - - - - <_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile" - Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName) - $(AdditionalDownloadedHostFxrInstallerFile) - - - + <_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile" + Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> + $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName) + $(AdditionalDownloadedHostFxrInstallerFile) + + + diff --git a/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs b/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs index 352a225cf..7506491f2 100644 --- a/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs +++ b/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs @@ -16,10 +16,14 @@ namespace Microsoft.DotNet.Cli.Build [Output] public string OSName { get; set; } + [Output] + public string OSPlatform { get; set; } + public override bool Execute() { Rid = RuntimeEnvironment.GetRuntimeIdentifier(); OSName = GetOSShortName(); + OSPlatform = RuntimeEnvironment.OperatingSystemPlatform.ToString().ToLower(); return true; }