Skip to content

Commit 39c2698

Browse files
author
Mirroring
committed
Merge commit 'e291efbc4d2a7a951f79049e017b99e9f08b5be3'
2 parents e8e6835 + e291efb commit 39c2698

File tree

8 files changed

+25
-25
lines changed

8 files changed

+25
-25
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ variables:
102102
- name: WindowsArm64InstallersLogArgs
103103
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
104104
- name: _InternalRuntimeDownloadArgs
105-
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
105+
value: -RuntimeSourceFeed https://ci.dot.net/internal
106106
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
107107
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
108108
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
109109
# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
110110
- name: _InternalRuntimeDownloadCodeSignArgs
111111
value: $(_InternalRuntimeDownloadArgs)
112-
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
112+
/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
113113
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
114114
- group: DotNet-HelixApi-Access
115115
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.3">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>913a1b7b347a2443586f3ae5e0638b9fd204276e</Sha>
381+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25208.3">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25208.7">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>913a1b7b347a2443586f3ae5e0638b9fd204276e</Sha>
386+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25208.3">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25208.7">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>913a1b7b347a2443586f3ae5e0638b9fd204276e</Sha>
390+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.3">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>913a1b7b347a2443586f3ae5e0638b9fd204276e</Sha>
394+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25208.3">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25208.7">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>913a1b7b347a2443586f3ae5e0638b9fd204276e</Sha>
398+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="8.1.0-preview.23604.1">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@
162162
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
163163
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
164164
<!-- Packages from dotnet/arcade -->
165-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25208.3</MicrosoftDotNetBuildTasksInstallersVersion>
166-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25208.3</MicrosoftDotNetBuildTasksTemplatingVersion>
167-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25208.3</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25208.7</MicrosoftDotNetBuildTasksInstallersVersion>
166+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25208.7</MicrosoftDotNetBuildTasksTemplatingVersion>
167+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25208.7</MicrosoftDotNetRemoteExecutorVersion>
168168
<!-- Packages from dotnet/source-build-externals -->
169169
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.25202.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
170170
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/templates-official/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ steps:
4444
# in the default public locations.
4545
internalRuntimeDownloadArgs=
4646
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
47-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
47+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4848
fi
4949
5050
buildConfig=Release

‎eng/helix/helix.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@
5757
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
5858
<PackageType>runtime</PackageType>
5959
</AdditionalDotNetPackage>
60-
61-
<AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
60+
61+
<AdditionalDotNetPackageFeed Include="https://ci.dot.net/internal"
6262
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
6363
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
6464
</AdditionalDotNetPackageFeed>
6565

66-
<AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
66+
<AdditionalDotNetPackageFeed Include="https://ci.dot.net/internal"
6767
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
6868
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
6969
</AdditionalDotNetPackageFeed>

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.114"
3+
"version": "8.0.115"
44
},
55
"tools": {
6-
"dotnet": "8.0.114",
6+
"dotnet": "8.0.115",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -25,8 +25,8 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.22.19",
28-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.3",
29-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.3"
28+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7",
29+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7"
3030
},
3131
"native-tools": {
3232
"jdk": "latest"

‎src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
560560
<!-- Try various places to find the runtime. It's either released (use official version),
561561
public but un-released (use dotnetbuilds/public), or internal and unreleased (use dotnetbuilds/internal) -->
562562
<ItemGroup>
563-
<UrisToDownload Include="https://dotnetcli.azureedge.net/dotnet/$(DotNetRuntimeDownloadPath)" />
563+
<UrisToDownload Include="https://builds.dotnet.microsoft.com/dotnet/$(DotNetRuntimeDownloadPath)" />
564564
<UrisToDownload Include="https://ci.dot.net/public/$(DotNetRuntimeDownloadPath)" />
565565
<UrisToDownload Include="https://ci.dot.net/internal/$(DotNetRuntimeDownloadPath)"
566566
Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">

‎src/Installers/Windows/WindowsHostingBundle/Product.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
-->
8484
<ItemGroup>
8585
<UrisToDownload Remove="@(UrisToDownload)" />
86-
<UrisToDownload Include="https://dotnetcli.azureedge.net/dotnet/Runtime/%(RemoteAsset.Identity)" />
86+
<UrisToDownload Include="https://builds.dotnet.microsoft.com/dotnet/Runtime/%(RemoteAsset.Identity)" />
8787
<UrisToDownload Include="https://ci.dot.net/public/Runtime/%(RemoteAsset.Identity)" />
8888
<UrisToDownload Include="https://ci.dot.net/internal/Runtime/%(RemoteAsset.Identity)"
8989
Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">

0 commit comments

Comments
 (0)