diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d801654bb..d91efec67 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -142,10 +142,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 timeoutInMinutes: 180 strategy: matrix: @@ -314,10 +314,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 timeoutInMinutes: 180 strategy: matrix: diff --git a/build.sh b/build.sh index 594a355fa..7ff647c40 100755 --- a/build.sh +++ b/build.sh @@ -53,7 +53,5 @@ dockerbuild() if [ ! -z "$BUILD_IN_DOCKER" ]; then dockerbuild $args else - # Run under sudo so we can set ulimit - # See https://github.com/dotnet/core-eng/issues/14808 - sudo -E $DIR/run-build.sh $args + $DIR/run-build.sh $args fi diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml new file mode 100644 index 000000000..3f8f08321 --- /dev/null +++ b/eng/source-build-tarball-build-official.yml @@ -0,0 +1,14 @@ +trigger: none +pr: none +resources: + pipelines: + - pipeline: installer-build-resource + source: dotnet-installer-official-ci + trigger: true + +stages: +- stage: build + jobs: + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + parameters: + tarballResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml index 2c7a9ae59..a800f5849 100644 --- a/eng/source-build-tarball-build.yml +++ b/eng/source-build-tarball-build.yml @@ -3,8 +3,8 @@ pr: none resources: pipelines: - pipeline: installer-build-resource - source: dotnet-installer-official-ci - trigger: true # Run pipeline when any run of dotnet-installer-official-ci completes + source: installer + trigger: true stages: - stage: build diff --git a/run-build.sh b/run-build.sh index fe839eb80..7b98aedc0 100755 --- a/run-build.sh +++ b/run-build.sh @@ -25,10 +25,6 @@ CUSTOM_BUILD_ARGS= # Set nuget package cache under the repo [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages" -# Set max number of files open, helps avoid errors during NuGet restore -# See https://github.com/dotnet/core-eng/issues/14808 -ulimit -n 16384 - args=( ) while [[ $# > 0 ]]; do diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 428271393..c4f57e632 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -7,10 +7,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 variables: _BuildConfig: Release workspace: diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 138e0c7db..70d81e3d6 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -10,87 +10,103 @@ parameters: # The resource id of the tarball to download and build tarballResourceId: current + # The following parameters aren't expected to be passed in rather they are used for encapsulation + # ----------------------------------------------------------------------------------------------- + fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + poolInternal: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + poolPublic: + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + tarballDir: $(Build.StagingDirectory)/tarball + jobs: -- job: Source_Build_Run_Tarball_Build +- job: Build_Tarball condition: ${{ parameters.condition }} - displayName: Source-Build Build Tarball + displayName: Build Tarball dependsOn: ${{ parameters.dependsOn }} pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open + ${{ parameters.poolPublic }} ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 + ${{ parameters.poolInternal }} strategy: matrix: Fedora33-Online: - _runOnline: true - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: true Fedora33-Offline: - _runOnline: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - timeoutInMinutes: 210 - variables: - _TarballDir: $(Build.StagingDirectory)/tarball - _BuildConfig: Release - _BuildArch: x64 + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false + timeoutInMinutes: 240 workspace: clean: all steps: - checkout: none - - download: ${{ parameters.tarballResourceId }} - artifact: BlobArtifacts - patterns: '**/dotnet-sdk-source*.tar.gz' - displayName: Download Tarball - - - script: | - set -x - - resourceIdPathSegment= - if [ '${{ parameters.tarballResourceId }}' != 'current' ]; then - resourceIdPathSegment='${{ parameters.tarballResourceId }}/' - fi - - mkdir -p "$(_TarballDir)" - tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" - eval tar -ozxf "$tarballFilePath" -C "$(_TarballDir)" - eval rm -f "$tarballFilePath" - displayName: Extract Tarball - - - script: | - set -x - - docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./prep.sh - displayName: Prep Tarball - - - script: | - set -x - df -h - - networkArgs= - customBuildArgs= - if [ '$(_runOnline)' = 'true' ]; then - customBuildArgs='--online' - else - networkArgs='--network none' - fi - - docker run --rm -v $(_TarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh ${customBuildArgs} -- /p:CleanWhileBuilding=true - displayName: Build Tarball - - - publish: '$(_TarballDir)/artifacts/$(_BuildArch)/$(_BuildConfig)/' - artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt) - displayName: Publish Source Build Artifacts - - - script: | - set -x - - docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test - displayName: Run Tests - - - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml + - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml parameters: - sourceFolder: $(_TarballDir) + buildArch: $(_BuildArch) + container: $(_Container) + prepScript: | + set -x + + docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh + runOnline: $(_RunOnline) + tarballDir: ${{ parameters.tarballDir }} + tarballResourceId: ${{ parameters.tarballResourceId }} + +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - job: Rebuild_Tarball + displayName: Rebuild Tarball With Previous + dependsOn: Build_Tarball + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ parameters.poolPublic }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + ${{ parameters.poolInternal }} + strategy: + matrix: + Fedora33-Offline: + _PreviousSourceBuildArtifact: Build Tarball Fedora33-Offline_Artifacts + _BuildArch: x64 + _Container: ${{ parameters.fedora33Container }} + _RunOnline: false + timeoutInMinutes: 180 + workspace: + clean: all + + steps: + - checkout: none + + - download: current + artifact: $(_PreviousSourceBuildArtifact) + patterns: '*.tar.gz' + displayName: Download Previous Source Build Artifacts + + - task: CopyFiles@2 + displayName: Copy Previous Source Build Artifacts + inputs: + SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact) + Contents: '*.tar.gz' + TargetFolder: ${{ parameters.tarballDir }}/packages/archive/ + + - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml + parameters: + additionalBuildArgs: --with-sdk /tarball/.dotnet + buildArch: $(_BuildArch) + container: $(_Container) + prepScript: | + set -x + + mkdir ${{ parameters.tarballDir }}/.dotnet + tarballFilePath="${{ parameters.tarballDir }}/packages/archive/dotnet-sdk-*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "${{ parameters.tarballDir }}/.dotnet" + eval rm -f "$tarballFilePath" + runOnline: $(_RunOnline) + tarballDir: ${{ parameters.tarballDir }} + tarballResourceId: ${{ parameters.tarballResourceId }} diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml new file mode 100644 index 000000000..30e55607d --- /dev/null +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -0,0 +1,75 @@ +# Steps used to build a source-build tarball + +parameters: + # Additional custom build args + additionalBuildArgs: "" + + # Architecture to build + buildArch: null + + # Container image to build within + container: null + + # Script logic to prep the tarball for building + prepScript: null + + # Whether or not to build online + runOnline: null + + # Directory to build the tarball in + tarballDir: + + # Resource id of the tarball to download and build + tarballResourceId: null + +steps: + - download: ${{ parameters.tarballResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-source*.tar.gz' + displayName: Download Tarball + + - script: | + set -x + + resourceIdPathSegment= + if [ '${{ parameters.tarballResourceId }}' != 'current' ]; then + resourceIdPathSegment='${{ parameters.tarballResourceId }}/' + fi + + mkdir -p "${{ parameters.tarballDir }}" + tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz" + eval tar -ozxf "$tarballFilePath" -C "${{ parameters.tarballDir }}" + eval rm -f "$tarballFilePath" + displayName: Extract Tarball + + - script: ${{ parameters.prepScript }} + displayName: Prep Tarball + + - script: | + set -x + df -h + + networkArgs= + customBuildArgs= + if [ '${{ parameters.runOnline}}' = 'true' ]; then + customBuildArgs='--online' + else + networkArgs='--network none' + fi + + docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${networkArgs} ${{ parameters.container }} ./build.sh ${customBuildArgs} ${{ parameters.additionalBuildArgs }} -- /p:CleanWhileBuilding=true + displayName: Build Tarball + + - script: | + set -x + + docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} + displayName: Run Tests + + - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml + parameters: + sourceFolder: ${{ parameters.tarballDir }} + + - publish: '${{ parameters.tarballDir }}/artifacts/${{ parameters.buildArch}}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index 51ddce047..89142c504 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -12,8 +12,7 @@ --> @@ -26,7 +25,6 @@ - diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index a9d0ed4c6..0007b6c6e 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-rc.2.21426.20" + "dotnet": "6.0.100" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.targets b/src/SourceBuild/tarball/content/repos/runtime.common.targets index ca606b23d..862b70dc8 100644 --- a/src/SourceBuild/tarball/content/repos/runtime.common.targets +++ b/src/SourceBuild/tarball/content/repos/runtime.common.targets @@ -23,7 +23,7 @@ diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index 22f91b0eb..9a26cd695 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -10,11 +10,6 @@ true $(BuildCommandArgs) -v $(LogVerbosity) - - $(BuildCommandArgs) /p:ProduceReferenceAssembly=false - $(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath) diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj index 090db5fbf..0a2fcff17 100644 --- a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj @@ -49,13 +49,47 @@ - + + + + + + + + + @(SourceFileName->'%(Filename)') + $(DestinationFileName.Replace('$(PackageName.ToLower()).','')) + + + + + + $([System.String]::concat('%3C','$(PackageName)','Version','%3E').Replace('.','')) + $([System.String]::concat('%3C','$(PackageName)','PackageVersion','%3E').Replace('.','')) + $(DestinationPath)PackageVersions.props + + + diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index b3815b840..f39c285b4 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -249,11 +249,10 @@ function doCommand() { echo " terminated with exit code $?" | tee -a "$logFile" elif [ "$1" == "multi-rid-publish" ]; then if [ "$lang" == "F#" ]; then - # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 runPublishScenarios() { - "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" /p:_NETCoreSdkIsPreview=true - "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" /p:_NETCoreSdkIsPreview=true - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" /p:_NETCoreSdkIsPreview=true + "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" + "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" } else runPublishScenarios() { @@ -271,9 +270,9 @@ function doCommand() { if [ "$lang" == "F#" ]; then # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true | tee -a "$logFile" + "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" else - "${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true >> "$logFile" 2>&1 + "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 fi else if [ "$projectOutput" == "true" ]; then @@ -324,8 +323,7 @@ function runAllTests() { doCommand VB xunit new restore test doCommand VB mstest new restore test - # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 - doCommand F# console new restore build multi-rid-publish + doCommand F# console new restore build run multi-rid-publish doCommand F# classlib new restore build multi-rid-publish doCommand F# xunit new restore test doCommand F# mstest new restore test @@ -350,16 +348,12 @@ function runWebTests() { doCommand C# mvc "$@" new restore build run multi-rid-publish doCommand C# webapi "$@" new restore build multi-rid-publish doCommand C# razor "$@" new restore build run multi-rid-publish - # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 - # doCommand C# blazorwasm "$@" new restore build run publish + doCommand C# blazorwasm "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish - # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554 - doCommand F# web "$@" new restore build multi-rid-publish - # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 - # doCommand F# mvc "$@" new restore build run multi-rid-publish - # "run" was also removed from this set, same issue: https://github.com/dotnet/source-build/issues/2554 - doCommand F# webapi "$@" new restore build multi-rid-publish + doCommand F# web "$@" new restore build run multi-rid-publish + doCommand F# mvc "$@" new restore build run multi-rid-publish + doCommand F# webapi "$@" new restore build run multi-rid-publish } function runXmlDocTests() { diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch b/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch new file mode 100644 index 000000000..161b962b7 --- /dev/null +++ b/src/SourceBuild/tarball/patches/runtime/0003-Disable-package-validation-in-source-build-for-relia.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Tue, 26 Oct 2021 13:24:57 -0500 +Subject: [PATCH] Disable package validation in source-build for reliability + +See comment in diff. + +Upstream PR: https://github.com/dotnet/runtime/pull/60881 +--- + eng/packaging.targets | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/eng/packaging.targets b/eng/packaging.targets +index ecf74672ac8..0a04191182d 100644 +--- a/eng/packaging.targets ++++ b/eng/packaging.targets +@@ -1,7 +1,13 @@ + + + +- true ++ ++ true + + true + $([MSBuild]::Subtract($(MajorVersion), 1)).0.0 diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index db6c2c6e5..89ccd630f 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,84 +1,95 @@ - - - - - - - - + + + + + + + + - + + + + + $(Architecture) + - - [%(Version)] - - - - - - - - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) + + %(Identity).Manifest-%(FeatureBand) + %(Identity).Manifest-%(FeatureBand).Msi.$(MsiArchitectureForWorkloadManifests) + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(MsiNupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower()) + $([MSBuild]::NormalizePath('%(RestoredMsiNupkgContentPath)/data/%(NupkgId).%(Version)-$(MsiArchitectureForWorkloadManifests).msi')) - + + + + [%(Version)] + + + + + + [%(Version)] + - + + + + + + + $(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe + $(ArtifactsLogDir)\workloadmanifestsigncheck.log + $(ArtifactsLogDir)\workloadmanifestsigncheck.errors.log + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - $(ArtifactsNonShippingPackagesDir)dotnet-sdkmanifests-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) - SDK_Manifests_$([MSBuild]::ValueOrDefault('$(Version)', '').Replace('-', '_')) - Microsoft .NET SDK Workload Manifests $(Version) - $(BaseOutputPath)$(Configuration)\sdk-manifests - - - - - - - - - - - - - - - - - - - diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 676485110..425337024 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -191,8 +191,8 @@ - - + + + + + + @(BundledManifests->' + + ', ' + ') + + + +]]> + - - - - - - - - - - - + + - - - - - .NET SDK @@ -76,7 +76,7 @@ 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若預計要搭配 Visual Studio 使用 .NET 5.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>. + 若預計要搭配 Visual Studio 使用 .NET 6.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet6-release-notes">深入了解</A>. 按一下 [\[]安裝[\[] 即表示您同意下列條款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 856aafc38..893412976 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -61,7 +61,7 @@ Tento produkt shromažďuje data o využití. Zdroje informací • Dokumentace k .NET : https://aka.ms/dotnet-docs • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs - • Zpráva k vydání verze: https://aka.ms/dotnet5-release-notes + • Zpráva k vydání verze: https://aka.ms/dotnet6-release-notes • Kurzy: https://aka.ms/dotnet-tutorials Sada .NET SDK @@ -76,7 +76,7 @@ Zdroje informací Poznámka k instalaci Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - Pokud se chystáte používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A>. + Pokud se chystáte používat .NET 6.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet6-release-notes">Další informace</A>. Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index 15fbe9b2d..1524c80c0 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -61,7 +61,7 @@ Dieses Produkt erfasst Nutzungsdaten. Ressourcen • .NET-Dokumentation: https://aka.ms/dotnet-docs • SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs - • Versionshinweise: https://aka.ms/dotnet5-release-notes + • Versionshinweise: https://aka.ms/dotnet6-release-notes • Tutorials: https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ Ressourcen Installationshinweis Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Weitere Informationen</A> + Wenn Sie .NET 6.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet6-release-notes">Weitere Informationen</A> Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index c83aeb2ad..daee64a00 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -61,7 +61,7 @@ Ce produit collecte des données d'utilisation Ressources • Documentation .NET sur https://aka.ms/dotnet-docs • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs - • Notes de publication sur https://aka.ms/dotnet5-release-notes + • Notes de publication sur https://aka.ms/dotnet6-release-notes • Tutoriels sur https://aka.ms/dotnet-tutorials SDK .NET @@ -76,7 +76,7 @@ Ressources Note d'installation Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - Si vous comptez utiliser .NET 5.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. + Si vous comptez utiliser .NET 6.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet6-release-notes">En savoir plus</A>. En cliquant sur Installer, vous acceptez les conditions suivantes. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 099ba280e..c8322a175 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -61,7 +61,7 @@ Questo prodotto consente di raccogliere i dati sull'utilizzo Risorse • Documentazione di .NET https://aka.ms/dotnet-docs • Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs - • Note sulla versione https://aka.ms/dotnet5-release-notes + • Note sulla versione https://aka.ms/dotnet6-release-notes • Esercitazioni https://aka.ms/dotnet-tutorials .NET SDK diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 3d46d4218..036f91f7d 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -61,7 +61,7 @@ リソース • .NET ドキュメント https://aka.ms/dotnet-docs • SDK ドキュメント https://aka.ms/dotnet-sdk-docs - • リリース ノート https://aka.ms/dotnet5-release-notes + • リリース ノート https://aka.ms/dotnet6-release-notes • チュートリアル https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .NET 5.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 + .NET 6.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet6-release-notes">詳細情報</A>。 [インストール] をクリックすると、次の条項に同意したものと見なされます。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index e6724467e..d0c8351c0 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -61,7 +61,7 @@ 리소스 • .NET 설명서 https://aka.ms/dotnet-docs • SDK 설명서 https://aka.ms/dotnet-sdk-docs - • 릴리스 정보 https://aka.ms/dotnet5-release-notes + • 릴리스 정보 https://aka.ms/dotnet6-release-notes • 자습서 https://aka.ms/dotnet-tutorials .NET SDK diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index 5b64006d2..95954a100 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -61,7 +61,7 @@ Ten produkt gromadzi dane dotyczące użycia Zasoby • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs - • Informacje o wersji: https://aka.ms/dotnet5-release-notes + • Informacje o wersji: https://aka.ms/dotnet6-release-notes • Samouczki: https://aka.ms/dotnet-tutorials .NET SDK diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index 9da7b5290..f8c3da0a5 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -61,7 +61,7 @@ Este produto coleta dados de uso Recursos • Documentação do .NET: https://aka.ms/dotnet-docs • Documentação do SDK: https://aka.ms/dotnet-sdk-docs - • Notas sobre a Versão: https://aka.ms/dotnet5-release-notes + • Notas sobre a Versão: https://aka.ms/dotnet6-release-notes • Tutoriais: https://aka.ms/dotnet-tutorials SDK do .NET @@ -76,7 +76,7 @@ Recursos Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. - Se você planeja usar o .NET 5.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>. + Se você planeja usar o .NET 6.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet6-release-notes">Saiba mais</A>. Ao clicar em instalar, você concorda com os termos a seguir. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index 1d9a54fbc..afd31da3f 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -61,7 +61,7 @@ Ресурсы • Документация по .NET: https://aka.ms/dotnet-docs • Документация по SDK: https://aka.ms/dotnet-sdk-docs - • Заметки о выпуске: https://aka.ms/dotnet5-release-notes + • Заметки о выпуске: https://aka.ms/dotnet6-release-notes • Учебники: https://aka.ms/dotnet-tutorials Пакет SDK для .NET diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index b56cc7d73..359ac186f 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -61,7 +61,7 @@ Bu ürün, kullanım verilerini toplar Kaynaklar • .NET Belgeleri https://aka.ms/dotnet-docs • SDK Belgeleri https://aka.ms/dotnet-sdk-docs - • Sürüm Notları https://aka.ms/dotnet5-release-notes + • Sürüm Notları https://aka.ms/dotnet6-release-notes • Öğreticiler https://aka.ms/dotnet-tutorials .NET SDK'sı @@ -76,7 +76,7 @@ Kaynaklar Yükleme notu Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. + Visual Studio ile .NET 6.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet6-release-notes">Daha Fazla Bilgi</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index 619135d2d..bf2209ebd 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -61,7 +61,7 @@ 资源 • .NET 文档: https://aka.ms/dotnet-docs • SDK 文档: https://aka.ms/dotnet-sdk-docs - • 发行说明: https://aka.ms/dotnet5-release-notes + • 发行说明: https://aka.ms/dotnet6-release-notes • 教程: https://aka.ms/dotnet-tutorials .NET SDK @@ -76,7 +76,7 @@ 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果打算结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 + 如果打算结合使用 .NET 6.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet6-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index ded1d606a..b65e2646c 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -61,7 +61,7 @@ Este producto recopila datos de uso Recursos • Documentación de .NET https://aka.ms/dotnet-docs • Documentación del SDK https://aka.ms/dotnet-sdk-docs - • Notas de la versión https://aka.ms/dotnet5-release-notes + • Notas de la versión https://aka.ms/dotnet6-release-notes • Tutoriales https://aka.ms/dotnet-tutorials SDK de .NET @@ -76,7 +76,7 @@ Recursos Nota de instalación Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - Si tiene previsto usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Obtenga más información</A>. + Si tiene previsto usar .NET 6.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet6-release-notes">Obtenga más información</A>. Al hacer clic en Instalar, acepta los términos siguientes. diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec deleted file mode 100644 index d32a3d0d8..000000000 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - VS.Redist.Common.NetCore.Manifest.$ARCH$ - 1.0.0 - VS.Redist.Common.NetCore.Manifest.$ARCH$ - Microsoft - Microsoft - https://www.microsoft.com/net/dotnet_library_license.htm - https://github.com/dotnet/core-sdk - true - .NET Core $MAJOR_MINOR$ SDK Manifests ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption - © Microsoft Corporation. All rights reserved. - - - - - diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 926929aa6..ac9261a94 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -194,10 +194,7 @@ - - - - + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index d68bf8441..4cf3d5697 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -2,6 +2,7 @@ # Licensed under the MIT license. See LICENSE file in the project root for full license information. param( + [Parameter(Mandatory=$true)][string]$WorkloadManifestWxsFile, [Parameter(Mandatory=$true)][string]$CLISDKMSIFile, [Parameter(Mandatory=$true)][string]$ASPNETRuntimeWixLibFile, [Parameter(Mandatory=$true)][string]$SharedFxMSIFile, @@ -18,7 +19,6 @@ param( [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$FinalizerExe, [Parameter(Mandatory=$true)][string]$TemplatesMSIFile, - [Parameter(Mandatory=$true)][string]$ManifestsMSIFile, [Parameter(Mandatory=$true)][string]$DotnetBundleOutput, [Parameter(Mandatory=$true)][string]$WixRoot, [Parameter(Mandatory=$true)][string]$ProductMoniker, @@ -78,7 +78,7 @@ function RunCandleForBundle -ext WixBalExtension.dll ` -ext WixUtilExtension.dll ` -ext WixTagExtension.dll ` - "$AuthWsxRoot\bundle.wxs" + "$AuthWsxRoot\bundle.wxs" "$WorkloadManifestWxsFile" Write-Information "Candle output: $candleOutput" @@ -97,11 +97,14 @@ function RunLightForBundle $result = $true pushd "$WixRoot" + $WorkloadManifestWixobjFile = [System.IO.Path]::GetFileNameWithoutExtension($WorkloadManifestWxsFile) + ".wixobj" + Write-Information "Running light for bundle.." $lightOutput = .\light.exe -nologo ` -cultures:en-us ` bundle.wixobj ` + $WorkloadManifestWixobjFile ` $ASPNETRuntimeWixlibFile ` -ext WixBalExtension.dll ` -ext WixUtilExtension.dll ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 deleted file mode 100644 index bef841dc2..000000000 --- a/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. - -param( - [Parameter(Mandatory=$true)][string]$inputDir, - [Parameter(Mandatory=$true)][string]$DotnetMSIOutput, - [Parameter(Mandatory=$true)][string]$WixRoot, - [Parameter(Mandatory=$true)][string]$ProductMoniker, - [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, - [Parameter(Mandatory=$true)][string]$SDKBundleVersion, - [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, - [Parameter(Mandatory=$true)][string]$UpgradeCode, - [Parameter(Mandatory=$true)][string]$DependencyKeyName, - [Parameter(Mandatory=$true)][string]$Architecture -) - -$InstallFileswsx = ".\manifest-install-files.wxs" -$InstallFilesWixobj = "manifest-install-files.wixobj" - -function RunHeat -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running heat.." - - $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment ` - -sreg -ag ` - -var var.DotnetSrc ` - -cg InstallFiles ` - -srd ` - -dr DOTNETHOME ` - -out manifest-install-files.wxs - - Write-Information "Heat output: $heatOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Heat failed with exit code $LastExitCode." - } - - popd - Write-Information "RunHeat result: $result" - return $result -} - -function RunCandle -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running candle.." - - $candleOutput = .\candle.exe -nologo ` - -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` - -dProductMoniker="$ProductMoniker" ` - -dBuildVersion="$DotnetMSIVersion" ` - -dSDKBundleVersion="$SDKBundleVersion" ` - -dNugetVersion="$DotnetCLINugetVersion" ` - -dUpgradeCode="$UpgradeCode" ` - -dDependencyKeyName="$DependencyKeyName" ` - -arch "$Architecture" ` - -ext WixDependencyExtension.dll ` - "$PSScriptRoot\manifests.wxs" ` - "$PSScriptRoot\provider.wxs" ` - "$PSScriptRoot\dotnethome_x64.wxs" ` - $InstallFileswsx - - Write-Information "Candle output: $candleOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Candle failed with exit code $LastExitCode." - } - - popd - return $result -} - -function RunLight -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running light.." - $CabCache = Join-Path $WixRoot "cabcache" - - $lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension ` - -cultures:en-us ` - manifests.wixobj ` - provider.wixobj ` - dotnethome_x64.wixobj ` - $InstallFilesWixobj ` - -b "$inputDir" ` - -b "$PSScriptRoot" ` - -reusecab ` - -cc "$CabCache" ` - -out $DotnetMSIOutput - - Write-Information "Light output: $lightOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Light failed with exit code $LastExitCode." - } - - popd - return $result -} - -if(!(Test-Path $inputDir)) -{ - throw "$inputDir not found" -} - -Write-Information "Creating manifests MSI at $DotnetMSIOutput" - -if([string]::IsNullOrEmpty($WixRoot)) -{ - Exit -1 -} - -if(-Not (RunHeat)) -{ - Write-Information "Heat failed" - Exit -1 -} - -if(-Not (RunCandle)) -{ - Write-Information "Candle failed" - Exit -1 -} - -if(-Not (RunLight)) -{ - Write-Information "Light failed" - Exit -1 -} - -if(!(Test-Path $DotnetMSIOutput)) -{ - throw "Unable to create the manifests MSI." - Exit -1 -} - -Write-Information "Successfully created manifests MSI - $DotnetMSIOutput" - -exit $LastExitCode