diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 4db1d90864a9..bfb716fa44fb 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -132,17 +132,17 @@ variables: - name: _InternalRuntimeDownloadCodeSignArgs value: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNet-MSRC-Storage + - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs - value: -RuntimeSourceFeed https://dotnetclimsrc.blob.core.windows.net/dotnet - -RuntimeSourceFeedKey $(dotnetclimsrc-read-sas-token-base64) - /p:DotNetAssetRootAccessTokenSuffix='$(dotnetclimsrc-read-sas-token-base64)' + value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal + -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)' # The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This # is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically. - name: _InternalRuntimeDownloadCodeSignArgs value: $(_InternalRuntimeDownloadArgs) - /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet - /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) + /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - group: DotNet-HelixApi-Access - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: - name: _SignType @@ -417,6 +417,7 @@ stages: --all --no-build-nodejs --no-build-java + --binarylog -p:OnlyPackPlatformSpecificPackages=true -p:AssetManifestFileName=aspnetcore-MacOS_arm64.xml $(_BuildArgs) @@ -447,6 +448,7 @@ stages: --all --no-build-nodejs --no-build-java + --binarylog -p:OnlyPackPlatformSpecificPackages=true -p:AssetManifestFileName=aspnetcore-MacOS_x64.xml $(_BuildArgs) @@ -481,18 +483,19 @@ stages: --all --no-build-nodejs --no-build-java + --binarylog -p:OnlyPackPlatformSpecificPackages=true $(_BuildArgs) $(_InternalRuntimeDownloadArgs) displayName: Run build.sh - script: git clean -xfd src/**/obj/; - ./dockerbuild.sh bionic --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs + ./dockerbuild.sh bionic --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs --init-nuget -p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=deb $(_BuildArgs) $(_InternalRuntimeDownloadArgs) displayName: Build Debian installers - script: git clean -xfd src/**/obj/; - ./dockerbuild.sh rhel --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs + ./dockerbuild.sh rhel --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs --init-nuget -p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm -p:AssetManifestFileName=aspnetcore-Linux_x64.xml $(_BuildArgs) @@ -525,6 +528,7 @@ stages: --all --no-build-nodejs --no-build-java + --binarylog -p:OnlyPackPlatformSpecificPackages=true -p:AssetManifestFileName=aspnetcore-Linux_arm.xml $(_BuildArgs) @@ -558,12 +562,13 @@ stages: --all --no-build-nodejs --no-build-java + --binarylog -p:OnlyPackPlatformSpecificPackages=true $(_BuildArgs) $(_InternalRuntimeDownloadArgs) displayName: Run build.sh - script: git clean -xfd src/**/obj/; - ./dockerbuild.sh rhel --ci --nobl --arch arm64 --build-installers --no-build-deps --no-build-nodejs + ./dockerbuild.sh rhel --ci --nobl --arch arm64 --build-installers --no-build-deps --no-build-nodejs --init-nuget -p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml $(_BuildArgs) @@ -598,6 +603,7 @@ stages: --all --no-build-nodejs --no-build-java + --binarylog -p:OnlyPackPlatformSpecificPackages=true -p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml $(_BuildArgs) @@ -633,6 +639,7 @@ stages: --all --no-build-nodejs --no-build-java + --binarylog -p:OnlyPackPlatformSpecificPackages=true -p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml $(_BuildArgs) @@ -667,6 +674,7 @@ stages: --all --no-build-nodejs --no-build-java + --binarylog -p:OnlyPackPlatformSpecificPackages=true -p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml $(_BuildArgs) @@ -789,7 +797,7 @@ stages: platform: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' - buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks' + buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)' skipPublishValidation: true timeoutInMinutes: 120 diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 5d5f835fd937..ce15ef379890 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -250,6 +250,7 @@ jobs: # Include the variables we always want. COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) # Expand provided `env:` properties, if any. ${{ if step.env }}: ${{ step.env }} @@ -261,12 +262,14 @@ jobs: env: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - ${{ if ne(parameters.agentOs, 'Windows') }}: - script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs) displayName: Run build.sh env: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core" + DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) - ${{ parameters.afterBuild }} diff --git a/NuGet.config b/NuGet.config index 372e9c6eb4dd..79f3fafadc47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,10 @@ + - + @@ -23,5 +24,13 @@ + + + + + + + + diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index bd11897b76a6..ec629dd0f009 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,486 +2,497 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 6.0.0 + 7.0.0 - - - 6.0.0 + + + 7.0.0 - - - 6.0.0 + + + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 - - - - - - - - - - - + 7.0.0 + + + + + + + + + + + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - - 6.0.0 - - - - - - - - 6.0.0 - - - - - - 6.0.0 + 7.0.0 - - + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - - + + + + - 6.0.0 + 7.0.0 - - + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - - + + + - 6.0.0 + 7.0.0 - - - - + + + + - - - - + + + + - - - + + + - 6.0.0 + 7.0.0 - - - + + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - + + - 6.0.0 + 7.0.0 - - - + + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 + + + + + + + + 7.0.0 - - - + + - 6.0.0 + 7.0.0 - - + + - 6.0.0 + 7.0.0 - - - - - - + + + + + + - 6.0.0 + 7.0.0 - - - - - - + + + + + + - 6.0.0 + 7.0.0 - - - + + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - - - - - - + + + + + + + - 6.0.0 + 7.0.0 - - - + + + + - 6.0.0 + 7.0.0 - - + + - + - - - + + + - + - + - - + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - + + - - + + - + - 6.0.0 - - - - - - - - + 7.0.0 + + + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - - + + + - 6.0.0 + 7.0.0 - - - + + + - - - + + + - - + + - 6.0.0 + 7.0.0 - - + + - - + + - + - 6.0.0 + 7.0.0 + + + + + + + 7.0.0 + + + + + + + + + 0.3.0 - - + + + - 6.0.0 + 7.0.0 - - - + + + - 6.0.0 + 7.0.0 - - + + - 6.0.0 + 7.0.0 - - - - + + + + - - - - + + + + - - - + + + - - - + + + - 6.0.0 + 7.0.0 - - - + + + - - + + - - + + - 6.0.0 + 7.0.0 - - - + + + - 6.0.0 + 7.0.0 - - - + + + - 6.0.0 + 7.0.0 - + - + @@ -491,501 +502,480 @@ - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - + + - 6.0.0 + 7.0.0 - - + + - - - 6.0.0 - - - - - - 6.0.0 + 7.0.0 - + - + - 6.0.0 + 7.0.0 + + + + + + + + + 7.0.0 - - - - + + - 6.0.0 + 7.0.0 - - - 6.0.0 - - - - 6.0.0 - - - - - - - - 6.0.0 + 7.0.0 - - - + + + - - - + + + - - + + - 6.0.0 - - - - - - - - - - - - - - + 7.0.0 + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - 6.0.0 + 7.0.0 - - - + + + - + - - - + + + - - - + + + - 6.0.0 + 7.0.0 - - + + - - + + - + - 6.0.0 + 7.0.0 - - + + - - + + - + - 6.0.0 + 7.0.0 - - + + - - + + - + - 6.0.0 + 7.0.0 - - - - - - - + + + + + + + - 6.0.0 + 7.0.0 - + - + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - + + - 6.0.0 + 7.0.0 - - + + - 6.0.0 - - - - - - - 6.0.0 + 7.0.0 - - - - + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - - 6.0.0 + + + 7.0.0 - - - 6.0.0 + + + 7.0.0 - - - 6.0.0 + + + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - - - + + + + - - - - + + + + - - - + + + - 6.0.0 + 7.0.0 - - - + + + + - - - + + + + - - + + + - 6.0.0 + 7.0.0 - - - + + + - - - + + + - - + + - 6.0.0 + 7.0.0 - - - - - + + + + + - - - - - + + + + + - - - - + + + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - - - + + + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - + + - + - 6.0.0 + 7.0.0 - - + + - 6.0.0 + 7.0.0 - - - - + + + + - - - - + + + + - - - + + + - 6.0.0 + 7.0.0 - - - - + + + + - - - - + + + + - - - + + + - 6.0.0 + 7.0.0 - - - - - + + + + + - - - - - + + + + + - - - - + + + + - 6.0.0 + 7.0.0 - 6.0.0 - - - - - - - + 7.0.0 + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - - - + + + + - - - + + + - - - + + + - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - - + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index afdf976591a5..fb5ba67dbbb9 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,114 +1,112 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 32108e1f9f29..3dfbd5efcf5e 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -55,6 +55,7 @@ $(InnerBuildArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRuntimeIdentifier) + $(InnerBuildArgs) /p:CrossgenOutput=false diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c3cf29db762..643e52e6f8c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,176 +10,176 @@ - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 - https://github.com/dotnet/efcore - 1f5aa6c6eb22d8a5f94adc9639f882ee01ae375a + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 865c6a897058a6ee4c7e014c0cefdcb04dc5e292 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 https://github.com/dotnet/source-build-externals @@ -187,108 +187,108 @@ - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 https://github.com/dotnet/xdt @@ -299,8 +299,8 @@ - https://github.com/dotnet/runtime - cd2d83798383716204eb580eb5c89ef5b73b8ec2 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 20753713c666..d48607e8a758 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 7 0 1 - false + true @@ -68,7 +68,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0-rtm.22513.12 + 7.0.0-rtm.22518.5 7.0.0 7.0.0 7.0.0 @@ -87,7 +87,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0-rtm.22513.12 + 7.0.0-rtm.22518.5 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0-rtm.22513.12 + 7.0.0-rtm.22518.5 7.0.0 7.0.0 7.0.0 @@ -232,13 +232,13 @@ 2.1.1 2.2.0 - 3.1.30-servicing-22476-24 + 3.1.31-servicing-22514-9 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) 5.0.17-servicing-22215-7 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) - 6.0.10-servicing-22476-17 + 6.0.11-servicing-22523-4 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version) @@ -297,10 +297,4 @@ 1.10.93 1.2.3 - - - - https://dotnetbuilds.azureedge.net/public/ - https://dotnetclimsrc.blob.core.windows.net/dotnet/ - diff --git a/eng/build.sh b/eng/build.sh index a6b6ba99be44..093b04affdd4 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -33,6 +33,7 @@ target_arch='x64' configuration='' runtime_source_feed='' runtime_source_feed_key='' +init_nuget=false if [ "$(uname)" = "Darwin" ]; then target_os_name='osx' @@ -82,6 +83,8 @@ Options: --runtime-source-feed Additional feed that can be used when downloading .NET runtimes and SDKs --runtime-source-feed-key Key for feed that can be used when downloading .NET runtimes and SDKs + --init-nuget Run nuget --version. + Description: This build script installs required tools and runs an MSBuild command on this repository This script can be used to invoke various targets, such as targets to produce packages @@ -208,6 +211,9 @@ while [[ $# -gt 0 ]]; do -ci) ci=true ;; + -init-nuget) + init_nuget=true + ;; -binarylog|-bl) binary_log=true ;; @@ -359,6 +365,30 @@ export MSBUILDDEBUGPATH="$log_dir" _tmp_restore=$restore restore=true +if [[ "$init_nuget" == true ]]; then + InitializeBuildTool + + function RunBuildTool { + "$_InitializeBuildTool" "$@" || { + local exit_code=$? + # We should not Write-PipelineTaskError here because that message shows up in the build summary + # The build already logged an error, that's the reason it failed. Producing an error here only adds noise. + echo "Build failed with exit code $exit_code. Check errors above." + if [[ "$ci" == "true" ]]; then + Write-PipelineSetResult -result "Failed" -message "nuget execution failed." + # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error + # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error + ExitWithExitCode 0 + else + ExitWithExitCode $exit_code + fi + } + } + + echo 'Running dotnet nuget --version (issue: https://github.com/NuGet/Home/issues/12159#issuecomment-1278360511)' + RunBuildTool "nuget" "--version" +fi + InitializeToolset restore=$_tmp_restore= diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index bd87b1cb4575..187baceb68c1 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -58,6 +58,11 @@ runtime + + $([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken')) + + diff --git a/eng/tools/RepoTasks/DownloadFile.cs b/eng/tools/RepoTasks/DownloadFile.cs deleted file mode 100644 index 7174fdae60f6..000000000000 --- a/eng/tools/RepoTasks/DownloadFile.cs +++ /dev/null @@ -1,148 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; -using System.Net.Http; -using System.Threading.Tasks; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; - -namespace RepoTasks; - -public class DownloadFile : Microsoft.Build.Utilities.Task -{ - [Required] - public string Uri { get; set; } - - /// - /// If this field is set and the task fail to download the file from `Uri`, with a NotFound - /// status, it will try to download the file from `PrivateUri`. - /// - public string PrivateUri { get; set; } - - /// - /// Suffix for the private URI in base64 form (for SAS compatibility) - /// - public string PrivateUriSuffix { get; set; } - - public int MaxRetries { get; set; } = 5; - - [Required] - public string DestinationPath { get; set; } - - public bool Overwrite { get; set; } - - public override bool Execute() - { - return ExecuteAsync().GetAwaiter().GetResult(); - } - - private async System.Threading.Tasks.Task ExecuteAsync() - { - string destinationDir = Path.GetDirectoryName(DestinationPath); - if (!Directory.Exists(destinationDir)) - { - Directory.CreateDirectory(destinationDir); - } - - if (File.Exists(DestinationPath) && !Overwrite) - { - return true; - } - - const string FileUriProtocol = "file://"; - - if (Uri.StartsWith(FileUriProtocol, StringComparison.Ordinal)) - { - var filePath = Uri.Substring(FileUriProtocol.Length); - Log.LogMessage($"Copying '{filePath}' to '{DestinationPath}'"); - File.Copy(filePath, DestinationPath); - return true; - } - - List errorMessages = new List(); - bool? downloadStatus = await DownloadWithRetriesAsync(Uri, DestinationPath, errorMessages); - - if (downloadStatus == false && !string.IsNullOrEmpty(PrivateUri)) - { - string uriSuffix = ""; - if (!string.IsNullOrEmpty(PrivateUriSuffix)) - { - var uriSuffixBytes = System.Convert.FromBase64String(PrivateUriSuffix); - uriSuffix = System.Text.Encoding.UTF8.GetString(uriSuffixBytes); - } - downloadStatus = await DownloadWithRetriesAsync($"{PrivateUri}{uriSuffix}", DestinationPath, errorMessages); - } - - if (downloadStatus != true) - { - foreach (var error in errorMessages) - { - Log.LogError(error); - } - } - - return downloadStatus == true; - } - - /// - /// Attempt to download file from `source` with retries when response error is different of FileNotFound and Success. - /// - /// URL to the file to be downloaded. - /// Local path where to put the downloaded file. - /// true: Download Succeeded. false: Download failed with 404. null: Download failed but is retriable. - private async Task DownloadWithRetriesAsync(string source, string target, List errorMessages) - { - Random rng = new Random(); - - Log.LogMessage(MessageImportance.High, $"Attempting download '{source}' to '{target}'"); - - using (var httpClient = new HttpClient { Timeout = TimeSpan.FromMinutes(7.5) }) - { - for (int retryNumber = 0; retryNumber < MaxRetries; retryNumber++) - { - try - { - var httpResponse = await httpClient.GetAsync(source); - - Log.LogMessage(MessageImportance.High, $"{source} -> {httpResponse.StatusCode}"); - - // The Azure Storage REST API returns '400 - Bad Request' in some cases - // where the resource is not found on the storage. - // https://docs.microsoft.com/en-us/rest/api/storageservices/common-rest-api-error-codes - if (httpResponse.StatusCode == HttpStatusCode.NotFound || - httpResponse.ReasonPhrase.IndexOf("The requested URI does not represent any resource on the server.", StringComparison.OrdinalIgnoreCase) == 0) - { - errorMessages.Add($"Problems downloading file from '{source}'. Does the resource exist on the storage? {httpResponse.StatusCode} : {httpResponse.ReasonPhrase}"); - return false; - } - - httpResponse.EnsureSuccessStatusCode(); - - using (var outStream = File.Create(target)) - { - await httpResponse.Content.CopyToAsync(outStream); - } - - Log.LogMessage(MessageImportance.High, $"returning true {source} -> {httpResponse.StatusCode}"); - return true; - } - catch (Exception e) - { - Log.LogMessage(MessageImportance.High, $"returning error in {source} "); - errorMessages.Add($"Problems downloading file from '{source}'. {e.Message} {e.StackTrace}"); - File.Delete(target); - } - - await System.Threading.Tasks.Task.Delay(rng.Next(1000, 10000)); - } - } - - Log.LogMessage(MessageImportance.High, $"giving up {source} "); - errorMessages.Add($"Giving up downloading the file from '{source}' after {MaxRetries} retries."); - return null; - } -} diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index 788558c3fa4c..c5722a9e266d 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -10,5 +10,5 @@ - + diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index bf90848a34bd..4ad7d58e60bb 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -32,8 +32,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) - $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/$(DotNetRuntimeArchiveFileName) - $(DotNetPrivateAssetRootUrl)Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/$(DotNetRuntimeArchiveFileName) + Runtime/$(MicrosoftNETCoreBrowserDebugHostTransportVersion)/$(DotNetRuntimeArchiveFileName) $(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName) @@ -502,11 +501,21 @@ This package is an internal implementation of the .NET Core SDK and is not meant ######################################### --> - + + + + + + $(DotnetRuntimeSourceFeedKey) + + + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index dab41417731c..2fe40ebe38a6 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -25,37 +25,49 @@ - - - https://dotnetcli.azureedge.net/dotnet/ - $(DotNetAssetRootUrl)/ - https://dotnetclimsrc.azureedge.net/dotnet/ - $(DotNetPrivateAssetRootUrl)/ - - + + - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-arm64.exe + + + + + + + + + + $(DotnetRuntimeSourceFeedKey) + + - + - + diff --git a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj index 7985b489fad6..b8ecbcdcadbb 100644 --- a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj +++ b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj @@ -10,7 +10,8 @@ - + +