From 151eaa1b1aa0ba4db90c77b3716e32f7b803f38f Mon Sep 17 00:00:00 2001 From: "Nikola Milosavljevic (CLR)" Date: Wed, 24 Jun 2020 08:13:27 -0700 Subject: [PATCH 1/2] Update baseline infra with specifics for deployment-tools repo --- Build.proj | 6 +- CONTRIBUTING.md | 6 +- README.md | 16 +- azure-pipelines.yml | 109 +--------- eng/Configurations.props | 24 +-- eng/SignCheckExclusionsFile.txt | 11 +- eng/Signing.props | 60 +----- eng/Subsets.props | 187 ++---------------- eng/build.ps1 | 40 +--- eng/build.sh | 76 +------ eng/jobs/bash-build.yml | 12 +- eng/jobs/run-publish-project.yml | 4 +- eng/jobs/steps/build-linux-package.yml | 2 +- eng/liveBuilds.targets | 164 +-------------- eng/stages/publish.yml | 2 +- src/clickonce/Directory.Build.props | 65 ------ src/clickonce/Directory.Build.targets | 148 +------------- src/clickonce/native/CMakeLists.txt | 6 +- .../native/Windows/gen-buildsys-win.bat | 20 +- src/clickonce/native/build.cmd | 44 ++--- src/clickonce/native/build.proj | 54 +---- src/clickonce/native/build.sh | 35 +--- src/clickonce/native/projects/exe.cmake | 13 +- src/clickonce/native/projects/setup.cmake | 24 +-- tools-local/scripts/dockerrun.sh | 4 +- 25 files changed, 121 insertions(+), 1011 deletions(-) diff --git a/Build.proj b/Build.proj index dc4a15ab5f..0bfa0f4370 100644 --- a/Build.proj +++ b/Build.proj @@ -23,10 +23,6 @@ - - - - - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 065a190dc7..1dfe7a90a3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,13 @@ -Contribution to .NET Runtime +Contribution to .NET Deployment-Tools ===================== -You can contribute to .NET Runtime with issues and PRs. Simply filing issues for problems you encounter is a great way to contribute. Contributing implementations is greatly appreciated. +You can contribute to .NET Deployment-Tools with issues and PRs. Simply filing issues for problems you encounter is a great way to contribute. Contributing implementations is greatly appreciated. ## Contribution "Bar" Project maintainers will merge changes that improve the product significantly and broadly and that align with the [.NET Roadmap](https://github.com/dotnet/core/blob/master/roadmap.md). -Maintainers will not merge changes that have narrowly-defined benefits, due to compatibility risk. The .NET Core codebase is used by several Microsoft products (for example, ASP.NET Core, .NET Framework 4.x, Windows Universal Apps) to enable execution of managed code. Other companies are building products on top of .NET, too. We may revert changes if they are found to be breaking. +Maintainers will not merge changes that have narrowly-defined benefits, due to compatibility risk. The .NET codebase is used by several Microsoft products (for example, ASP.NET Core, .NET Framework 4.x, Windows Universal Apps) to enable execution of managed code. Other companies are building products on top of .NET, too. We may revert changes if they are found to be breaking. Contributions must also satisfy the other published guidelines defined in this document. diff --git a/README.md b/README.md index b1d2839ea3..29da57b44f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,7 @@ -# .NET Runtime +# .NET Deployment Tools -[![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/runtime/runtime?branchName=master)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=686&branchName=master) -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dotnet/runtime) - -This repo contains the code to build the .NET runtime, libraries and shared host (`dotnet`) installers for -all supported platforms, as well as the sources to .NET runtime and libraries. +This repo contains the code to build the .NET deployment tools and installers for +all supported platforms, as well as the sources to .NET deployment tools. ## What is .NET? @@ -12,7 +9,6 @@ Official Starting Page: https://dotnet.microsoft.com/ * [How to use .NET](https://docs.microsoft.com/dotnet/core/get-started) (with VS, VS Code, command-line CLI) * [Install official releases](https://dotnet.microsoft.com/download) - * [Install daily builds](https://github.com/dotnet/installer#installers-and-binaries) * [Documentation](https://docs.microsoft.com/dotnet/core) (Get Started, Tutorials, Porting from .NET Framework, API reference, ...) * [Deploying apps](https://docs.microsoft.com/dotnet/core/deploying) * [Supported OS versions](https://github.com/dotnet/core/blob/master/os-lifecycle-policy.md) @@ -35,7 +31,7 @@ Also see info about related [Microsoft .NET Core and ASP.NET Core Bug Bounty Pro ## Filing issues -This repo should contain issues that are tied to the runtime, the class libraries and frameworks, the installation of the `dotnet` binary (sometimes known as the `muxer`) and installation of the .NET runtime and libraries. +This repo should contain issues that are tied to .NET deployment tools and its installation packages. For other issues, please use the following repos: @@ -51,7 +47,7 @@ For other issues, please use the following repos: ## .NET Foundation -.NET Runtime is a [.NET Foundation](https://www.dotnetfoundation.org/projects) project. +.NET Deployment Tools is a [.NET Foundation](https://www.dotnetfoundation.org/projects) project. There are many .NET related projects on GitHub. @@ -64,4 +60,4 @@ General .NET OSS discussions: [.NET Foundation forums](https://forums.dotnetfoun ## License -.NET (including the runtime repo) is licensed under the [MIT](LICENSE.TXT) license. +.NET (including the deployment-tools repo) is licensed under the [MIT](LICENSE.TXT) license. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b5238b5f9c..2766fa7909 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,13 +3,12 @@ trigger: branches: include: - master - - release/3.* - - internal/release/3.* + - release/* + - internal/release/* pr: - master -- release/3.* -- internal/release/3.* +- release/* name: $(Date:yyyyMMdd)$(Rev:.r) @@ -40,112 +39,12 @@ variables: - name: SignType value: $[ coalesce(variables.OfficialSignType, 'real') ] # Values for SDLValidationParameters - - group: core-setup-sdl-validation + - group: deployment-tools-sdl-validation stages: - stage: Build jobs: - # -------- Build Bash legs (Linux and FreeBSD) -------- - - template: /eng/jobs/bash-build.yml - parameters: - crossBuild: true - name: Linux_Arm - dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-e435274-20180426002420 - additionalRunArgs: -e ROOTFS_DIR=/crossrootfs/arm - portableBuild: true - skipTests: true - targetArchitecture: arm - - - template: /eng/jobs/bash-build.yml - parameters: - crossBuild: true - name: Linux_Arm64 - dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180316023254 - additionalRunArgs: -e ROOTFS_DIR=/crossrootfs/arm64 - portableBuild: true - skipTests: true - targetArchitecture: arm64 - - # # Tizen build only for PR build - # - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - # - template: /eng/jobs/bash-build.yml - # parameters: - # additionalMSBuildArgs: /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json /p:OutputRid=tizen.5.0.0-armel - # additionalRunArgs: -e ROOTFS_DIR=/crossrootfs/armel.tizen.build - # crossBuild: true - # name: Linux_ArmRel_Tizen - # disableCrossgen: true - # dockerImage: tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1 - # portableBuild: false - # skipTests: true - # targetArchitecture: armel - - - template: /eng/jobs/bash-build.yml - parameters: - additionalMSBuildArgs: /p:OutputRid=linux-musl-arm64 - crossBuild: true - name: Linux_Arm64_Alpine37 - dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine10fcdcf-20190208200917 - additionalRunArgs: -e ROOTFS_DIR=/crossrootfs/arm64 - portableBuild: false - skipTests: true - targetArchitecture: arm64 - - - template: /eng/jobs/bash-build.yml - parameters: - additionalMSBuildArgs: /p:OutputRid=linux-musl-x64 - name: Linux_x64_Alpine36 - dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-3e800f1-20190508143246 - portableBuild: false - targetArchitecture: x64 - - - template: /eng/jobs/bash-build.yml - parameters: - name: Linux_x64_glibc - dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-d485f41-20173404063424 - packageDistroList: - - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-debpkg-e5cf912-20175003025046 - imageRid: ubuntu.14.04 - rids: [] - - image: mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-c982313-20174116044113 - imageRid: rhel.7 - rids: - - centos.7 - - fedora.27 - - opensuse.42 - - oraclelinux.7 - - sles.12 - portableBuild: true - targetArchitecture: x64 - - - template: /eng/jobs/bash-build.yml - parameters: - additionalMSBuildArgs: /p:OutputRid=rhel.6-x64 - name: Linux_x64_Rhel6 - dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-6-376e1a3-20174311014331 - portableBuild: false - targetArchitecture: x64 - - # -------- Build OSX (macOS) leg -------- - - template: /eng/jobs/osx-build.yml - parameters: - name: OSX - # -------- Build Windows legs -------- - # Windows Arm - - template: /eng/jobs/windows-build.yml - parameters: - name: Windows_Arm - skipTests: true - targetArchitecture: arm - - # Windows Arm64 - - template: /eng/jobs/windows-build.yml - parameters: - name: Windows_Arm64 - skipTests: true - targetArchitecture: arm64 - # Windows x64 - template: /eng/jobs/windows-build.yml parameters: diff --git a/eng/Configurations.props b/eng/Configurations.props index 1d6ad36e81..a9906bc743 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -5,14 +5,10 @@ --> - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'clickonce')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'tools-local')) $([MSBuild]::NormalizeDirectory('$(RepoToolsLocalDir)', 'tasks')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs')) @@ -33,16 +29,9 @@ net472 - + - $(Configuration) - $(Configuration) - Debug - $(RuntimeConfiguration) - $(RuntimeConfiguration) - - Debug - $(Configuration) + $(Configuration) @@ -56,9 +45,7 @@ Solaris Linux Windows_NT - $(TargetOS) - $(TargetOS) - $(TargetOS) + $(TargetOS) @@ -67,8 +54,7 @@ - true true - + \ No newline at end of file diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt index dc77ca3e46..50d972da27 100644 --- a/eng/SignCheckExclusionsFile.txt +++ b/eng/SignCheckExclusionsFile.txt @@ -6,10 +6,7 @@ ;; The apphost and comhost are template files, modified by the SDK to produce the executable for FDE ;; and SCD apps. If they are signed, the file that the SDK produces has an invalid signature and ;; can't be signed again. More info at https://github.com/dotnet/core-setup/pull/7549. -*apphost.exe;;Template, https://github.com/dotnet/core-setup/pull/7549 -*singlefilehost.exe;;Template, https://github.com/dotnet/core-setup/pull/7549 -*comhost.dll;;Template, https://github.com/dotnet/core-setup/pull/7549 -*apphosttemplateapphostexe.exe;;Template, https://github.com/dotnet/core-setup/pull/7549 -*comhosttemplatecomhostdll.dll;;Template, https://github.com/dotnet/core-setup/pull/7549 -*staticapphosttemplateapphostexe.exe;;Template, https://github.com/dotnet/core-setup/pull/7549 -*dotnet.js;;Workaround, https://github.com/dotnet/core-eng/issues/9933 + +;; Examples: +;; *apphost.exe;;Template, https://github.com/dotnet/core-setup/pull/7549 +;; *apphosttemplateapphostexe.exe;;Template, https://github.com/dotnet/core-setup/pull/7549 diff --git a/eng/Signing.props b/eng/Signing.props index 34821db7fc..618fe73017 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -26,61 +26,14 @@ - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -108,11 +61,6 @@ - - - - - diff --git a/eng/Subsets.props b/eng/Subsets.props index a058a944b9..0c6c43743e 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -37,8 +37,8 @@ --> - clr+mono+libs+installer - mono+libs+installer + clickonce+installer + clickonce+installer @@ -54,21 +54,12 @@ - clr.runtime+linuxdac+clr.corelib+clr.nativecorelib+clr.tools+clr.packages - - mono.llvm+ - $(DefaultMonoSubsets)mono.runtime+mono.corelib - - libs.depprojs+libs.native+libs.ref+libs.src+libs.pretest+libs.packages - - corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles+installers+installer.tests - installer.pkgprojs + clickonce + installers - <_subset>$(_subset.Replace('+clr+', '+$(DefaultCoreClrSubsets)+')) - <_subset>$(_subset.Replace('+mono+', '+$(DefaultMonoSubsets)+')) - <_subset>$(_subset.Replace('+libs+', '+$(DefaultLibrariesSubsets)+')) + <_subset>$(_subset.Replace('+clickonce+', '+$(DefaultClickOnceSubsets)+')) <_subset>$(_subset.Replace('+installer+', '+$(DefaultInstallerSubsets)+')) @@ -76,41 +67,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - @@ -123,141 +84,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Configuration=$(LibrariesConfiguration) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + - - - - - - - - - - - - - - - Configuration=$(CoreCLRConfiguration) - Configuration=$(MonoConfiguration) - Configuration=$(LibrariesConfiguration) + Configuration=$(ClickOnceConfiguration) diff --git a/eng/build.ps1 b/eng/build.ps1 index bfce8766ec..7bb9f90744 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -13,8 +13,6 @@ Param( [switch]$testnobuild, [ValidateSet("x86","x64","arm","arm64","wasm")][string[]][Alias('a')]$arch = @([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()), [Parameter(Position=0)][string][Alias('s')]$subset, - [ValidateSet("Debug","Release","Checked")][string][Alias('rc')]$runtimeConfiguration, - [ValidateSet("Debug","Release")][string][Alias('lc')]$librariesConfiguration, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -30,14 +28,8 @@ function Get-Help() { Write-Host " Pass a comma-separated list to build for multiple configurations." Write-Host " [Default: Debug]" Write-Host " -help (-h) Print help and exit." - Write-Host " -librariesConfiguration (-lc) Libraries build configuration: Debug or Release." - Write-Host " [Default: Debug]" Write-Host " -os Target operating system: Windows_NT, Linux, OSX, or Browser." Write-Host " [Default: Your machine's OS.]" - Write-Host " -runtimeConfiguration (-rc) Runtime build configuration: Debug, Release or Checked." - Write-Host " Checked is exclusive to the CLR runtime. It is the same as Debug, except code is" - Write-Host " compiled with optimizations enabled." - Write-Host " [Default: Debug]" Write-Host " -subset (-s) Build a subset, print available subsets with -subset help." Write-Host " '-subset' can be omitted if the subset is given as the first argument." Write-Host " [Default: Builds the entire repo.]" @@ -78,24 +70,8 @@ function Get-Help() { Write-Host "Here are some quick examples. These assume you are on a Windows x64 machine:" Write-Host "" - Write-Host "* Build CoreCLR for Windows x64 on Release configuration:" - Write-Host ".\build.cmd clr -c release" - Write-Host "" - Write-Host "* Cross-compile CoreCLR runtime for Windows ARM64 on Release configuration." - Write-Host ".\build.cmd clr.runtime -arch arm64 -c release" - Write-Host "" - Write-Host "* Build Debug libraries with a Release runtime for Windows x64." - Write-Host ".\build.cmd clr+libs -rc release" - Write-Host "" - Write-Host "* Build Release libraries and their tests with a Checked runtime for Windows x64, and run the tests." - Write-Host ".\build.cmd clr+libs+libs.tests -rc checked -lc release -test" - Write-Host "" - Write-Host "* Build Mono runtime for Windows x64 on Release configuration." - Write-Host ".\build.cmd mono -c release" - Write-Host "" - Write-Host "It's important to mention that to build Mono for the first time," - Write-Host "you need to build the CLR and Libs subsets beforehand." - Write-Host "This is done automatically if a full build is performed at first." + Write-Host "* Build ClickOnce tools for Windows x64 on Release configuration:" + Write-Host ".\build.cmd clickonce -c release" Write-Host "" Write-Host "For more information, check out https://github.com/dotnet/runtime/blob/master/docs/workflow/README.md" } @@ -115,8 +91,8 @@ if ($vs) { if (-Not (Test-Path $vs)) { $solution = $vs - # Search for the solution in libraries - $vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "src\libraries" | Join-Path -ChildPath $vs | Join-Path -ChildPath "$vs.sln" + # Search for the solution in clickonce + $vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "src\clickonce" | Join-Path -ChildPath $vs | Join-Path -ChildPath "$vs.sln" if (-Not (Test-Path $vs)) { $vs = $solution # Search for the solution in installer @@ -143,12 +119,6 @@ if ($vs) { # Put our local dotnet.exe on PATH first so Visual Studio knows which one to use $env:PATH=($env:DOTNET_ROOT + ";" + $env:PATH); - if ($runtimeConfiguration) - { - # Respect the RuntimeConfiguration variable for building inside VS with different runtime configurations - $env:RUNTIMECONFIGURATION=$runtimeConfiguration - } - # Restore the solution to workaround https://github.com/dotnet/runtime/issues/32205 Invoke-Expression "& dotnet restore $vs" @@ -173,8 +143,6 @@ foreach ($argument in $PSBoundParameters.Keys) { switch($argument) { - "runtimeConfiguration" { $arguments += " /p:RuntimeConfiguration=$((Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])))" } - "librariesConfiguration" { $arguments += " /p:LibrariesConfiguration=$((Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])))" } "framework" { $arguments += " /p:BuildTargetFramework=$($PSBoundParameters[$argument].ToLowerInvariant())" } "os" { $arguments += " /p:TargetOS=$($PSBoundParameters[$argument])" } "allconfigurations" { $arguments += " /p:BuildAllConfigurations=true" } diff --git a/eng/build.sh b/eng/build.sh index 97df9cd8a1..6c430c5f29 100644 --- a/eng/build.sh +++ b/eng/build.sh @@ -26,16 +26,10 @@ usage() echo " compiled with optimizations enabled." echo " [Default: Debug]" echo " --help (-h) Print help and exit." - echo " --librariesConfiguration (-lc) Libraries build configuration: Debug or Release." - echo " [Default: Debug]" echo " --os Target operating system: Windows_NT, Linux, FreeBSD, OSX, tvOS, iOS, Android," echo " Browser, NetBSD, illumos or Solaris." echo " [Default: Your machine's OS.]" echo " --projects Project or solution file(s) to build." - echo " --runtimeConfiguration (-rc) Runtime build configuration: Debug, Release or Checked." - echo " Checked is exclusive to the CLR runtime. It is the same as Debug, except code is" - echo " compiled with optimizations enabled." - echo " [Default: Debug]" echo " --subset (-s) Build a subset, print available subsets with -subset help." echo " '--subset' can be omitted if the subset is given as the first argument." echo " [Default: Builds the entire repo.]" @@ -82,34 +76,10 @@ usage() echo "Here are some quick examples. These assume you are on a Linux x64 machine:" echo "" - echo "* Build CoreCLR for Linux x64 on Release configuration:" - echo "./build.sh clr -c release" - echo "" - echo "* Build Debug libraries with a Release runtime for Linux x64." - echo "./build.sh clr+libs -rc release" - echo "" - echo "* Build Release libraries and their tests with a Checked runtime for Linux x64, and run the tests." - echo "./build.sh clr+libs+libs.tests -rc checked -lc release -test" - echo "" - echo "* Build CoreCLR for Linux x64 on Debug configuration using Clang 9." - echo "./build.sh clr -clang9" - echo "" - echo "* Build CoreCLR for Linux x64 on Debug configuration using GCC 8.4." - echo "./build.sh clr -gcc8.4" - echo "" - echo "* Cross-compile CoreCLR runtime for Linux ARM64 on Release configuration." - echo "./build.sh clr.runtime -arch arm64 -c release -cross" - echo "" - echo "However, for this example, you need to already have ROOTFS_DIR set up." - echo "Further information on this can be found here:" - echo "https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/linux-instructions.md" + echo "There are no projects that build for Linux at the moment - these are just examples." echo "" - echo "* Build Mono runtime for Linux x64 on Release configuration." - echo "./build.sh mono -c release" - echo "" - echo "It's important to mention that to build Mono for the first time," - echo "you need to build the CLR and Libs subsets beforehand." - echo "This is done automatically if a full build is performed at first." + echo "* Build ClickOnce for Linux x64 on Release configuration:" + echo "./build.sh clickonce -c release" echo "" echo "For more general information, check out https://github.com/dotnet/runtime/blob/master/docs/workflow/README.md" } @@ -296,46 +266,6 @@ while [[ $# > 0 ]]; do shift 1 ;; - -runtimeconfiguration|-rc) - if [ -z ${2+x} ]; then - echo "No runtime configuration supplied. See help (--help) for supported runtime configurations." 1>&2 - exit 1 - fi - passedRuntimeConf="$(echo "$2" | awk '{print tolower($0)}')" - case "$passedRuntimeConf" in - debug|release|checked) - val="$(tr '[:lower:]' '[:upper:]' <<< ${passedRuntimeConf:0:1})${passedRuntimeConf:1}" - ;; - *) - echo "Unsupported runtime configuration '$2'." - echo "The allowed values are Debug, Release, and Checked." - exit 1 - ;; - esac - arguments="$arguments /p:RuntimeConfiguration=$val" - shift 2 - ;; - - -librariesconfiguration|-lc) - if [ -z ${2+x} ]; then - echo "No libraries configuration supplied. See help (--help) for supported libraries configurations." 1>&2 - exit 1 - fi - passedLibConf="$(echo "$2" | awk '{print tolower($0)}')" - case "$passedLibConf" in - debug|release) - val="$(tr '[:lower:]' '[:upper:]' <<< ${passedLibConf:0:1})${passedLibConf:1}" - ;; - *) - echo "Unsupported libraries configuration '$2'." - echo "The allowed values are Debug and Release." - exit 1 - ;; - esac - arguments="$arguments /p:LibrariesConfiguration=$val" - shift 2 - ;; - -cross) crossBuild=1 arguments="$arguments /p:CrossBuild=True" diff --git a/eng/jobs/bash-build.yml b/eng/jobs/bash-build.yml index 9dc2f3e9cc..d46534c268 100644 --- a/eng/jobs/bash-build.yml +++ b/eng/jobs/bash-build.yml @@ -40,8 +40,8 @@ jobs: ${{ if ne(parameters.name, 'FreeBSD_x64')}}: RunArguments: >- docker run --privileged --rm - -v "$(Build.SourcesDirectory):/root/coresetup" - -w="/root/coresetup" + -v "$(Build.SourcesDirectory):/root/deploymenttools" + -w="/root/deploymenttools" $(PreserveNuGetAuthDockerArgs) ${{ parameters.additionalRunArgs }} ${{ parameters.dockerImage }} @@ -51,11 +51,11 @@ jobs: ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: BuildScript: ./eng/install-nuget-credprovider-then-build.sh - MSBuildScript: /root/coresetup/eng/install-nuget-credprovider-then-msbuild.sh + MSBuildScript: /root/deploymenttools/eng/install-nuget-credprovider-then-msbuild.sh ${{ if not(and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))) }}: BuildScript: ./build.sh - MSBuildScript: /root/coresetup/eng/common/msbuild.sh + MSBuildScript: /root/deploymenttools/eng/common/msbuild.sh CommonMSBuildArgs: >- /p:Configuration=$(_BuildConfig) @@ -89,9 +89,9 @@ jobs: DockerRunMSBuild: >- docker run - -v $(Build.SourcesDirectory):/root/coresetup + -v $(Build.SourcesDirectory):/root/deploymenttools -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ - -w=/root/coresetup + -w=/root/deploymenttools $(PreserveNuGetAuthDockerArgs) steps: diff --git a/eng/jobs/run-publish-project.yml b/eng/jobs/run-publish-project.yml index 628720da4d..9f4cd9da6d 100644 --- a/eng/jobs/run-publish-project.yml +++ b/eng/jobs/run-publish-project.yml @@ -23,7 +23,7 @@ jobs: variables: # Only get the secret variable groups if the def has the official name. Reduce dev build def risk. - - ${{ if eq(variables['Build.DefinitionName'], 'dotnet-core-setup') }}: + - ${{ if eq(variables['Build.DefinitionName'], 'dotnet-deployment-tools') }}: # Used for publishing individual leg assets to azure blob storage - ${{ if eq(parameters.dependency.channel.public, 'true') }}: - group: DotNet-DotNetCli-Storage @@ -64,7 +64,7 @@ jobs: /p:GitHubAuthToken=$(_GitHubAuthToken) /p:VersionsRepoOwner=$(_VersionsRepoOwner) /p:VersionsRepo=$(_VersionsRepo) - /p:VersionsRepoPath=build-info/dotnet/core-setup/$(FullBranchName) + /p:VersionsRepoPath=build-info/dotnet/deployment-tools/$(FullBranchName) - ${{ if ne(parameters.dependency.channel.public, 'true') }}: - name: _DefaultAzureAccountName diff --git a/eng/jobs/steps/build-linux-package.yml b/eng/jobs/steps/build-linux-package.yml index c69e68df90..4c8aa93985 100644 --- a/eng/jobs/steps/build-linux-package.yml +++ b/eng/jobs/steps/build-linux-package.yml @@ -13,7 +13,7 @@ steps: df -h $(DockerRunMSBuild) ${{ parameters.image }} $(MSBuildScript) \ --ci \ - /root/coresetup/tools-local/tasks/core-setup.tasks.csproj \ + /root/deploymenttools/tools-local/tasks/installer.tasks/installer.tasks.csproj \ /t:Restore /t:Build /t:CreateHostMachineInfoFile \ $(CommonMSBuildArgs) \ /bl:msbuild.${{ parameters.distroRid }}.traversaldependencies.binlog diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 75edb9846c..6a2141ebf0 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -1,21 +1,16 @@ - $([MSBuild]::NormalizeDirectory('$(CoreCLROverridePath)')) - $([MSBuild]::NormalizeDirectory('$(MonoOverridePath)')) - $([MSBuild]::NormalizeDirectory('$(LibrariesOverridePath)')) - $([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigurationsOverridePath)')) + $([MSBuild]::NormalizeDirectory('$(ClickOnceOverridePath)')) - $([MSBuild]::NormalizeDirectory('$(RuntimeArtifactsPath)')) - $([MSBuild]::NormalizeDirectory('$(RuntimeArtifactsPath)')) - $(LibrariesTargetOS)-$(LibrariesConfiguration)-$(TargetArchitecture) + $([MSBuild]::NormalizeDirectory('$(RuntimeArtifactsPath)')) $(ArtifactPlatform.Replace('-', '_')) - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'CoreCLRProduct_$(ArtifactPlatform)_$(CoreCLRConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'MonoProduct_$(ArtifactPlatform)_$(MonoConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'libraries_bin_$(ArtifactPlatform)_$(LibrariesConfiguration)')) - - - * + $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'ClickOnceProduct_$(ArtifactPlatform)_$(ClickOnceConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLRTargetOS).$(TargetArchitecture).$(CoreCLRConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'mono', '$(MonoTargetOS).$(TargetArchitecture).$(MonoConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts')) - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ClickOnce', '$(ClickOnceTargetOS).$(TargetArchitecture).$(ClickOnceConfiguration)')) - - - $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework')) - $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'crossgen2')) - - $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'packages', '$(LibrariesConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(LibrariesPackagesDir)', 'Shipping')) - $([MSBuild]::NormalizeDirectory('$(LibrariesPackagesDir)', 'NonShipping')) - - $([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigurationsArtifactsPath)', 'packages', '$(LibrariesConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigPackagesDir)', 'Shipping')) - $([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigPackagesDir)', 'NonShipping')) - - $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'ref', 'microsoft.netcore.app', '$(LibrariesConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'ref', '$(NetCoreAppCurrent)')) - $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'pkg', '$(NetCoreAppCurrent)', 'runtime'))$(LibrariesTargetOSConfigurationArchitecture)\ - $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'runtime'))$(NetCoreAppCurrent)-$(LibrariesTargetOSConfigurationArchitecture)\ - $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'bin', 'native'))$(NetCoreAppCurrent)-$(LibrariesTargetOSConfigurationArchitecture)\ - - x64 - x86 - x64 - x64 - - - - - - - - $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)')) - - $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','sharedFramework')) - $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','$(CoreCLRCrossTargetComponentDirName)','sharedFramework')) - - - $([MSBuild]::NormalizeDirectory('$(MonoArtifactsPath)')) - - - - - - - - true - - <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll" - Condition="Exists('$(CoreCLRArtifactsPath)System.Private.CoreLib.dll')" /> - <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll" - Condition="Exists('$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll') and '@(_systemPrivateCoreLib)' == ''" /> - - - - - - - - runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(RuntimeIdGraphDefinitionFile) diff --git a/eng/stages/publish.yml b/eng/stages/publish.yml index 8e440c91f2..52b7a96d4d 100644 --- a/eng/stages/publish.yml +++ b/eng/stages/publish.yml @@ -16,7 +16,7 @@ stages: # quotes inside the string so that it passes through to MSBuild without script interference. symbolPublishingAdditionalParameters: "'-warnAsError:$false'" publishInstallersAndChecksums: true - # Enable SDL validation, passing through values from the 'core-setup-sdl-validation' group. + # Enable SDL validation, passing through values from the 'deployment-tools-sdl-validation' group. SDLValidationParameters: enable: true artifactNames: diff --git a/src/clickonce/Directory.Build.props b/src/clickonce/Directory.Build.props index 6ded9b98c9..eaa36ffbdd 100644 --- a/src/clickonce/Directory.Build.props +++ b/src/clickonce/Directory.Build.props @@ -29,21 +29,9 @@ $(InstallerProjectRoot)signing\ - - $(ArtifactsObjDir)HostMachineInfo.props - - - - Microsoft.NETCore.App - .NETCoreApp - $(NETCoreAppFrameworkIdentifier),Version=v$(NETCoreAppFrameworkVersion) - .NET Core $(NETCoreAppFrameworkVersion) - - true - true @@ -78,13 +66,6 @@ $(DefineConstants),TRACE - - .exe - - - - $(HostMachineRid.Remove($(HostMachineRid.LastIndexOf('-'))))-$(TargetArchitecture) @@ -111,7 +92,6 @@ $(OutputRid).$(Configuration) $(ArtifactsBinDir)$(OSPlatformConfig)\ - $(BaseOutputRootPath)crossgen\ $(ArtifactsObjDir)$(OSPlatformConfig)\ @@ -120,40 +100,12 @@ $(ArtifactsShippingPackagesDir) $(ArtifactsShippingPackagesDir) - - - $(IntermediateOutputRootPath)sharedFrameworkPublish/ - $(IntermediateOutputRootPath)sharedFrameworkPublish.symbols\ - false - - true $(AssetOutputPath)sharedfx_$(OutputRid)_$(Configuration)_version_badge.svg - - dotnet-host- - dotnet-hostfxr- - dotnet-runtime- - dotnet-runtime-deps- - - $(AssetOutputPath)$(DotnetRuntimeString) - $(AssetOutputPath)$(DotnetHostString) - $(AssetOutputPath)$(DotnetHostFxrString) - $(AssetOutputPath)$(DotnetRuntimeString) - $(AssetOutputPath)$(DotnetRuntimeDependenciesPackageString) - - - internal - $(SharedHostInstallerStart)$(InstallerStartSuffix)- - $(HostFxrInstallerStart)$(InstallerStartSuffix)- - $(SharedFrameworkInstallerStart)$(InstallerStartSuffix)- - - - 4 @@ -275,12 +227,6 @@ .zip .tar.gz - .msi - .pkg - .deb - .rpm - .exe - $(InstallerExtension) @@ -297,10 +243,6 @@ false false - - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)documentation - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)documentation @@ -326,11 +268,4 @@ .lib - - .map - .ni.pdb - - - - diff --git a/src/clickonce/Directory.Build.targets b/src/clickonce/Directory.Build.targets index 687aebcad6..d005630924 100644 --- a/src/clickonce/Directory.Build.targets +++ b/src/clickonce/Directory.Build.targets @@ -9,8 +9,6 @@ - - @@ -19,13 +17,6 @@ - - - - - - - - - - false - $(ProductVersion) - 2.0.0 - - - false - $(ProductVersion) - 2.0.0 - - - false - $(ProductVersion) - 2.0.0 - - - false - $(ProductVersion) - 2.0.0 + $(ProductVersion) Runtime/$(SharedFrameworkNugetVersion)/ $(SharedFrameworkNugetVersion)-$(PackageTargetRid) - $(HostResolverVersion)-$(PackageTargetRid) - - - - $(HostVersion) - 1 - $(HostResolverVersion) - 1 - $(SharedFrameworkNugetVersion) - 1 - $(RuntimeDepsDebVersion) - 1 - $(RuntimeDepsRpmVersion) - 1 - - - - $(ProductionVersion) - $(ProductionVersion)~$(VersionSuffix) - - $(ProductionVersion) - $(ProductionVersion)~$(VersionSuffix) - - $(ProductionVersion) - $(ProductionVersion)~$(VersionSuffix) - - $(ProductionVersion) - $(ProductionVersion)~$(VersionSuffix) - - - - $(ProductionVersion) - - 0.1.$(VersionSuffix) - $([System.String]::Copy('$(HostPackageRelease)').Replace('-', '_')) - - $(ProductionVersion) - - 0.1.$(VersionSuffix) - $([System.String]::Copy('$(HostResolverPackageRelease)').Replace('-', '_')) - - $(ProductionVersion) - 0.1.$(VersionSuffix) - $([System.String]::Copy('$(RuntimePackageRelease)').Replace('-', '_')) - - $(ProductionVersion) - 0.1.$(VersionSuffix) - $([System.String]::Copy('$(RuntimeDepsRpmPackageRelease)').Replace('-', '_')) - $(CombinedInstallerStart)$(ProductMoniker)$(CombinedInstallerExtension) - $(CombinedInstallerStart)$(ProductMoniker)-engine.exe - - $(SharedHostInstallerStart)$(ProductMoniker)$(InstallerExtension) - $(HostFxrInstallerStart)$(HostResolverVersionMoniker)$(InstallerExtension) - $(SharedFrameworkInstallerStart)$(ProductMoniker)$(InstallerExtension) - $(DotnetRuntimeDependenciesPackageInstallerStart)$(ProductMoniker)$(InstallerExtension) - - dotnet-runtime-$(ProductMoniker)$(CompressedFileExtension) - dotnet-hostfxr-internal-$(PackageTargetRid).$(HostResolverVersion)$(CompressedFileExtension) - dotnet-nethost-$(AppHostVersion)-$(PackageTargetRid)$(CompressedFileExtension) - dotnet-runtime-internal-$(ProductMoniker)$(CompressedFileExtension) - dotnet-runtime-symbols-$(ProductMoniker)$(CompressedFileExtension) - - $(DotnetHostFxrString)$(ProductBandVersion) - $(HostFxrDebPkgName.ToLower()) - $(DotnetRuntimeString)$(ProductBandVersion) - $(SharedFxDebPkgName.ToLower()) - $(DotnetRuntimeDependenciesPackageString)$(ProductBandVersion) - $(RuntimeDependenciesDebPkgName.ToLower()) - - dotnet-hostfxr-$(ProductBandVersion) - $(HostFxrRpmPkgName.ToLower()) - dotnet-runtime-$(ProductBandVersion) - $(SharedFxRpmPkgName.ToLower()) - $(DotnetRuntimeDependenciesPackageString)$(ProductBandVersion) - $(RuntimeDependenciesRpmPkgName.ToLower()) - - - - $(AssetOutputPath)dotnet-targeting-pack-$(ProductMoniker)$(InstallerExtension) - $(AssetOutputPath)dotnet-apphost-pack-$(ProductMoniker)$(InstallerExtension) - 2.1 - $(NetStandardProductBandVersion).$(PatchVersion)$(ProductVersionSuffix)-$(PackageTargetRid) - $(AssetOutputPath)netstandard-targeting-pack-$(NetStandardProductMoniker)$(InstallerExtension) - - - - - $(SharedHostInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) - $(HostFxrInstallerStart)$(HostResolverVersion)-$(TargetArchitecture)$(InstallerExtension) - $(SharedFrameworkInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) + deployment-tools-$(ProductMoniker)$(CompressedFileExtension) - - - $(DotnetRuntimeDependenciesPackageInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension) - - - - $(IntermediateOutputRootPath)corehost\cmake\ - - $(Configuration) $(TargetArchitecture) -apphostver "$(AppHostVersion)" -hostver "$(HostVersion)" -fxrver "$(HostResolverVersion)" -policyver "$(HostPolicyVersion)" -commithash "$(LatestCommit)" - $(BuildArgs) -portablebuild=false - $(BuildArgs) -cross - $(BuildArgs) $(Compiler) - $(BuildArgs) $(CMakeArgs) - - - - - - - - - .NET Host - - - .NET Host Resolver - $(HostResolverVersion) - - - .NET Host Policy - $(HostPolicyVersion) - - - .NET COM Host - - - .NET IJW Host - - - .NET WinRT Host - - - .NET Component Host - + + !Exists('$(IntermediateOutputRootPath)nativeResourceFiles\%(NativeFiles.Identity)\version_info.h')"/> - $(Configuration) $(TargetArchitecture) apphostver $(AppHostVersion) hostver $(HostVersion) fxrver $(HostResolverVersion) policyver $(HostPolicyVersion) commit $(LatestCommit) rid $(OutputRid) + $(Configuration) $(TargetArchitecture) nativever $(NativeVersion) netcorepkgver $(BundledNETCoreAppPackageVersion) commit $(LatestCommit) rid $(OutputRid) $(BuildArgs) portable $(BuildArgs) incremental-native-build $(BuildArgs) rootdir $(RepoRoot) diff --git a/src/clickonce/native/build.sh b/src/clickonce/native/build.sh index 7be41faa3c..71a2ec7a8f 100644 --- a/src/clickonce/native/build.sh +++ b/src/clickonce/native/build.sh @@ -1,9 +1,6 @@ #!/usr/bin/env bash -usage_list=("-hostver : Version of the dotnet executable.") -usage_list+=("-apphostver : Version of the apphost executable.") -usage_list+=("-fxrver : Version of the hostfxr library.") -usage_list+=("-policyver : Version of the hostpolicy library.") +usage_list=("-nativever : Version of native binaries.") usage_list+=("-commithash : Current commit hash of the repo at build time.") set -e @@ -27,32 +24,14 @@ __SkipGenerateVersion=0 __StaticLibLink=0 __UnprocessedBuildArgs= __VerboseBuild=false -__host_ver= -__apphost_ver= -__policy_ver= -__fxr_ver= +__native_ver= __commit_hash= handle_arguments() { case "$1" in - hostver|-hostver) - __host_ver="$2" - __ShiftArgs=1 - ;; - - apphostver|-apphostver) - __apphost_ver="$2" - __ShiftArgs=1 - ;; - - fxrver|-fxrver) - __fxr_ver="$2" - __ShiftArgs=1 - ;; - - policyver|-policyver) - __policy_ver="$2" + nativever|-nativever) + __native_ver="$2" __ShiftArgs=1 ;; @@ -79,15 +58,15 @@ __IntermediatesDir="$__RootBinDir/obj/$__DistroRidLower.$__BuildType" export __BinDir __IntermediatesDir -__CMakeArgs="-DCLI_CMAKE_HOST_VER=\"$__host_ver\" -DCLI_CMAKE_COMMON_HOST_VER=\"$__apphost_ver\" -DCLI_CMAKE_HOST_FXR_VER=\"$__fxr_ver\" $__CMakeArgs" -__CMakeArgs="-DCLI_CMAKE_HOST_POLICY_VER=\"$__policy_ver\" -DCLI_CMAKE_PKG_RID=\"$__DistroRid\" -DCLI_CMAKE_COMMIT_HASH=\"$__commit_hash\" $__CMakeArgs" +__CMakeArgs="-DCLI_CMAKE_NATIVE_VER=\"$__native_ver\" $__CMakeArgs" +__CMakeArgs="-DCLI_CMAKE_PKG_RID=\"$__DistroRid\" -DCLI_CMAKE_COMMIT_HASH=\"$__commit_hash\" $__CMakeArgs" if [[ "$__PortableBuild" == 1 ]]; then __CMakeArgs="-DCLI_CMAKE_PORTABLE_BUILD=1 $__CMakeArgs" fi # Specify path to be set for CMAKE_INSTALL_PREFIX. -# This is where all built CoreClr libraries will copied to. +# This is where all built binaries will be copied to. __CMakeBinDir="$__BinDir" export __CMakeBinDir diff --git a/src/clickonce/native/projects/exe.cmake b/src/clickonce/native/projects/exe.cmake index 3728e05ff2..7ce58cab3b 100644 --- a/src/clickonce/native/projects/exe.cmake +++ b/src/clickonce/native/projects/exe.cmake @@ -9,23 +9,12 @@ cmake_policy(SET CMP0083 NEW) include(${CMAKE_CURRENT_LIST_DIR}/common.cmake) -# Include directories -include_directories(${CMAKE_CURRENT_LIST_DIR}/fxr) - -# CMake does not recommend using globbing since it messes with the freshness checks -list(APPEND SOURCES - ${CMAKE_CURRENT_LIST_DIR}/fxr_resolver.cpp - ${CMAKE_CURRENT_LIST_DIR}/../corehost.cpp -) - add_executable(${DOTNET_PROJECT_NAME} ${SOURCES} ${RESOURCES}) -target_link_libraries(${DOTNET_PROJECT_NAME} libhostmisc) if(NOT CLR_CMAKE_TARGET_WIN32) disable_pax_mprotect(${DOTNET_PROJECT_NAME}) endif() -install(TARGETS ${DOTNET_PROJECT_NAME} DESTINATION corehost) -install_symbols(${DOTNET_PROJECT_NAME} corehost) +install_with_stripped_symbols(${DOTNET_PROJECT_NAME} TARGETS native) set_common_libs("exe") diff --git a/src/clickonce/native/projects/setup.cmake b/src/clickonce/native/projects/setup.cmake index 0d6a1cdb12..b2f17c32df 100644 --- a/src/clickonce/native/projects/setup.cmake +++ b/src/clickonce/native/projects/setup.cmake @@ -6,28 +6,10 @@ if (CLI_CMAKE_PORTABLE_BUILD) add_definitions(-DFEATURE_PORTABLE_BUILD=1) endif () -if("${CLI_CMAKE_HOST_POLICY_VER}" STREQUAL "") - message(FATAL_ERROR "Host policy version is not specified") +if("${CLI_CMAKE_NATIVE_VER}" STREQUAL "") + message(FATAL_ERROR "Native version is not specified") else() - add_definitions(-DHOST_POLICY_PKG_VER="${CLI_CMAKE_HOST_POLICY_VER}") -endif() - -if("${CLI_CMAKE_HOST_FXR_VER}" STREQUAL "") - message(FATAL_ERROR "Host FXR version is not specified") -else() - add_definitions(-DHOST_FXR_PKG_VER="${CLI_CMAKE_HOST_FXR_VER}") -endif() - -if("${CLI_CMAKE_HOST_VER}" STREQUAL "") - message(FATAL_ERROR "Dotnet host version is not specified") -else() - add_definitions(-DHOST_PKG_VER="${CLI_CMAKE_HOST_VER}") -endif() - -if("${CLI_CMAKE_COMMON_HOST_VER}" STREQUAL "") - message(FATAL_ERROR "Common host version is not specified") -else() - add_definitions(-DCOMMON_HOST_PKG_VER="${CLI_CMAKE_COMMON_HOST_VER}") + add_definitions(-DNATIVE_PKG_VER="${CLI_CMAKE_NATIVE_VER}") endif() if("${CLI_CMAKE_PKG_RID}" STREQUAL "") diff --git a/tools-local/scripts/dockerrun.sh b/tools-local/scripts/dockerrun.sh index ebcc541373..c28847a048 100644 --- a/tools-local/scripts/dockerrun.sh +++ b/tools-local/scripts/dockerrun.sh @@ -78,8 +78,8 @@ if [ -z "$DOCKERFILE" ]; then fi fi -[ -z "$DOTNET_BUILD_CONTAINER_TAG" ] && DOTNET_BUILD_CONTAINER_TAG="dotnet-coresetup-build" -[ -z "$DOTNET_BUILD_CONTAINER_NAME" ] && DOTNET_BUILD_CONTAINER_NAME="dotnet-coresetup-build-container" +[ -z "$DOTNET_BUILD_CONTAINER_TAG" ] && DOTNET_BUILD_CONTAINER_TAG="dotnet-deploymenttools-build" +[ -z "$DOTNET_BUILD_CONTAINER_NAME" ] && DOTNET_BUILD_CONTAINER_NAME="dotnet-deploymenttools-build-container" [ -z "$DOCKER_HOST_SHARE_DIR" ] && DOCKER_HOST_SHARE_DIR="$(pwd)" # Make container names CI-specific if we're running in CI From fafe21e4bc57d0830a7a76bbfedfd31e7d290d41 Mon Sep 17 00:00:00 2001 From: "Nikola Milosavljevic (CLR)" Date: Mon, 29 Jun 2020 13:23:35 -0700 Subject: [PATCH 2/2] Updates for PR comments --- CONTRIBUTING.md | 2 +- Directory.Build.targets | 1 - azure-pipelines.yml | 1 + eng/Configurations.props | 1 - eng/SignCheckExclusionsFile.txt | 4 --- eng/Signing.props | 3 -- eng/Subsets.props | 4 +-- eng/build.ps1 | 3 ++ eng/liveBuilds.targets | 50 ----------------------------- src/clickonce/Directory.Build.props | 4 --- src/clickonce/native/build.proj | 11 ++----- src/clickonce/native/build.sh | 2 +- 12 files changed, 10 insertions(+), 76 deletions(-) delete mode 100644 eng/liveBuilds.targets diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1dfe7a90a3..5eadc1f604 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -Contribution to .NET Deployment-Tools +Contribution to .NET Deployment Tools ===================== You can contribute to .NET Deployment-Tools with issues and PRs. Simply filing issues for problems you encounter is a great way to contribute. Contributing implementations is greatly appreciated. diff --git a/Directory.Build.targets b/Directory.Build.targets index f16e04d9b4..f3dea4da70 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -8,7 +8,6 @@ false - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2766fa7909..5220fbace0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,6 +9,7 @@ trigger: pr: - master - release/* +- internal/release/* name: $(Date:yyyyMMdd)$(Rev:.r) diff --git a/eng/Configurations.props b/eng/Configurations.props index a9906bc743..8cbcb39cbc 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -45,7 +45,6 @@ Solaris Linux Windows_NT - $(TargetOS) diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt index 50d972da27..fd8537759d 100644 --- a/eng/SignCheckExclusionsFile.txt +++ b/eng/SignCheckExclusionsFile.txt @@ -3,10 +3,6 @@ ;; ;; This issue tracks a way to implement exclusions via Signing.props and avoid this extra file: https://github.com/dotnet/arcade/issues/2888 -;; The apphost and comhost are template files, modified by the SDK to produce the executable for FDE -;; and SCD apps. If they are signed, the file that the SDK produces has an invalid signature and -;; can't be signed again. More info at https://github.com/dotnet/core-setup/pull/7549. - ;; Examples: ;; *apphost.exe;;Template, https://github.com/dotnet/core-setup/pull/7549 ;; *apphosttemplateapphostexe.exe;;Template, https://github.com/dotnet/core-setup/pull/7549 diff --git a/eng/Signing.props b/eng/Signing.props index 618fe73017..53b2c23837 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -10,7 +10,6 @@ - @@ -32,8 +31,6 @@ - - diff --git a/eng/Subsets.props b/eng/Subsets.props index 0c6c43743e..8979a3c494 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -71,7 +71,7 @@ - + @@ -93,7 +93,7 @@ - + diff --git a/eng/build.ps1 b/eng/build.ps1 index 7bb9f90744..38519b23f4 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -73,6 +73,9 @@ function Get-Help() { Write-Host "* Build ClickOnce tools for Windows x64 on Release configuration:" Write-Host ".\build.cmd clickonce -c release" Write-Host "" + Write-Host "* Build ClickOnce tools and installers for Windows x64 on Release configuration:" + Write-Host ".\build.cmd clickonce+installer -c release" + Write-Host "" Write-Host "For more information, check out https://github.com/dotnet/runtime/blob/master/docs/workflow/README.md" } diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets deleted file mode 100644 index 6a2141ebf0..0000000000 --- a/eng/liveBuilds.targets +++ /dev/null @@ -1,50 +0,0 @@ - - - - $([MSBuild]::NormalizeDirectory('$(ClickOnceOverridePath)')) - - - $([MSBuild]::NormalizeDirectory('$(RuntimeArtifactsPath)')) - - - - - - $(RuntimeIdentifier) - $(ArtifactPlatform.Replace('win-', 'Windows_NT-')) - $(ArtifactPlatform.Replace('unix-', 'Unix-')) - $(ArtifactPlatform.Replace('linux-', 'Linux-')) - $(ArtifactPlatform.Replace('osx-', 'OSX-')) - $(ArtifactPlatform.Replace('freebsd-', 'FreeBSD-')) - $(ArtifactPlatform.Replace('netbsd-', 'NetBSD-')) - - $(ArtifactPlatform.Replace('-', '_')) - - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'ClickOnceProduct_$(ArtifactPlatform)_$(ClickOnceConfiguration)')) - - - - - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'ClickOnce', '$(ClickOnceTargetOS).$(TargetArchitecture).$(ClickOnceConfiguration)')) - - - - - - $(RuntimeIdGraphDefinitionFile) - $(LiveRuntimeIdentifierGraphPath) - - diff --git a/src/clickonce/Directory.Build.props b/src/clickonce/Directory.Build.props index eaa36ffbdd..ef59cc0b72 100644 --- a/src/clickonce/Directory.Build.props +++ b/src/clickonce/Directory.Build.props @@ -102,10 +102,6 @@ $(ArtifactsShippingPackagesDir) - - $(AssetOutputPath)sharedfx_$(OutputRid)_$(Configuration)_version_badge.svg - - 4 diff --git a/src/clickonce/native/build.proj b/src/clickonce/native/build.proj index e46686a3b8..c20e3f8ab6 100644 --- a/src/clickonce/native/build.proj +++ b/src/clickonce/native/build.proj @@ -18,19 +18,12 @@ DependsOnTargets=" GetProductVersions; GenerateNativeVersionFile; - BuildCoreHostWindows" /> + BuildNativeProjects" /> - - - - - - : Version of native binaries.") +usage_list=("-nativever : Version of native binaries.") usage_list+=("-commithash : Current commit hash of the repo at build time.") set -e