diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 1af3d63d7..d396d75b0 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -424,6 +424,13 @@ jobs: continueOnError: true condition: succeededOrFailed() + - ${{ if or(ne(variables['System.TeamProject'], 'internal'), eq(variables['Build.Reason'], 'PullRequest')) }}: + - publish: $(Build.StagingDirectory)/BuildLogs + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: always() + # Only upload test results if enabled - ${{ if eq(parameters.runTests, 'True') }}: - task: PublishTestResults@2 @@ -454,3 +461,10 @@ jobs: SourceFolder: $(sourcesPath)/artifacts/packages TargetFolder: $(Build.ArtifactStagingDirectory)/publishing/packages displayName: Copy packages to Artifact Staging Directory + + - ${{ if or(ne(variables['System.TeamProject'], 'internal'), eq(variables['Build.Reason'], 'PullRequest')) }}: + - publish: $(Build.ArtifactStagingDirectory)/publishing + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 71ad70903..33edc19d0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -97,7 +97,6 @@ <_NET80RuntimePackVersion>8.0.$(VersionFeature80) <_NET80TargetingPackVersion>8.0.$(VersionFeature80) - <_NET80WebAssemblyPackVersion>8.0.$(VersionFeature80) <_WindowsDesktop80RuntimePackVersion>8.0.$(VersionFeature80) <_WindowsDesktop80TargetingPackVersion>8.0.$(VersionFeature80) <_AspNet80RuntimePackVersion>8.0.$(VersionFeature80) @@ -695,7 +694,7 @@ Copyright (c) .NET Foundation. All rights reserved. + WebAssemblySdkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" /> + WebAssemblySdkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" /> + WebAssemblySdkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />