Skip to content

Commit ea27fdf

Browse files
DonnaChen888DonnaChen888
authored
Merge branch 'release/8.0.4xx' into merge/release/8.0.3xx-to-release/8.0.4xx
2 parents d35b659 + 32a7cbf commit ea27fdf

File tree

9 files changed

+70
-47
lines changed

9 files changed

+70
-47
lines changed

‎.vsts-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ variables:
3434
value: ''
3535
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
3636
- name: _InternalRuntimeDownloadArgs
37-
value: /p:DotNetRuntimeSourceFeed=http://ci.dot.net/internal
37+
value: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
3838
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
3939
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
4040
- template: /eng/common/templates-official/variables/pool-providers.yml

‎.vsts-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ variables:
3030

3131
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
3232
- name: _InternalRuntimeDownloadArgs
33-
value: /p:DotNetRuntimeSourceFeed=http://ci.dot.net/internal
33+
value: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
3434
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
3535
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
3636

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<UsagePattern IdentityGlob="NuGet.*/*" />
1313

1414
<!-- These MSBuild packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
15-
<UsagePattern IdentityGlob="Microsoft.Build*/17.10.*" />
16-
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.10.*" />
15+
<UsagePattern IdentityGlob="Microsoft.Build*/17.11.*" />
16+
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.11.*" />
1717

1818
<!-- These emsdk packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
1919
<UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100/8.0.*" />

‎eng/Version.Details.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@
8585
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
8686
<Sha>ee417479933278bb5aadc5944706a96b5ef74a5d</Sha>
8787
</Dependency>
88-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.319">
88+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.416">
8989
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
90-
<Sha>b96dd68949c90cf8ae1e5e089e44a4b687ae2587</Sha>
90+
<Sha>bd8ff52a950627d432878cee33a0c3696836df75</Sha>
9191
</Dependency>
92-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.319-servicing.25528.6">
92+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.416-servicing.25528.7">
9393
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
94-
<Sha>b96dd68949c90cf8ae1e5e089e44a4b687ae2587</Sha>
94+
<Sha>bd8ff52a950627d432878cee33a0c3696836df75</Sha>
9595
</Dependency>
96-
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.319-servicing.25528.6">
96+
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.416-servicing.25528.7">
9797
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
98-
<Sha>b96dd68949c90cf8ae1e5e089e44a4b687ae2587</Sha>
98+
<Sha>bd8ff52a950627d432878cee33a0c3696836df75</Sha>
9999
<SourceBuild RepoName="sdk" ManagedOnly="true" />
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.319-servicing.25528.6">
101+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.416-servicing.25528.7">
102102
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
103-
<Sha>b96dd68949c90cf8ae1e5e089e44a4b687ae2587</Sha>
103+
<Sha>bd8ff52a950627d432878cee33a0c3696836df75</Sha>
104104
</Dependency>
105105
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
106106
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -132,36 +132,36 @@
132132
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
133133
<Sha>925e025a1ad14f0b6f094e5b2d5cc9f62ada294c</Sha>
134134
</Dependency>
135-
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
135+
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2" CoherentParentDependency="Microsoft.NET.Sdk">
136136
<Uri>https://github.com/dotnet/fsharp</Uri>
137-
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
137+
<Sha>e11d7079bebc6f101c5313fe0d1de9e3d38a7c02</Sha>
138138
</Dependency>
139-
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
139+
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.403-beta.24526.2" CoherentParentDependency="Microsoft.NET.Sdk">
140140
<Uri>https://github.com/dotnet/fsharp</Uri>
141-
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
141+
<Sha>e11d7079bebc6f101c5313fe0d1de9e3d38a7c02</Sha>
142142
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
143143
</Dependency>
144-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24317-02" CoherentParentDependency="Microsoft.NET.Sdk">
144+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.11.1-release-24455-02" CoherentParentDependency="Microsoft.NET.Sdk">
145145
<Uri>https://github.com/microsoft/vstest</Uri>
146-
<Sha>c4d80397805bec06b354d20aeb1773e243c6add0</Sha>
146+
<Sha>7855c9b221686104532ebf3380f2d45b3613b369</Sha>
147147
<SourceBuild RepoName="vstest" ManagedOnly="true" />
148148
</Dependency>
149149
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.22" CoherentParentDependency="Microsoft.NET.Sdk">
150150
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
151151
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.25064.8" CoherentParentDependency="Microsoft.NET.Sdk">
153+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24554.2" CoherentParentDependency="Microsoft.NET.Sdk">
154154
<Uri>https://github.com/dotnet/roslyn</Uri>
155-
<Sha>85262f5f51be12867c1c2776d7a2be55251c04be</Sha>
155+
<Sha>bc1c3011064a493b0ca527df6fb7215e2e5cfa96</Sha>
156156
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
157157
</Dependency>
158-
<Dependency Name="Microsoft.Build" Version="17.10.46" CoherentParentDependency="Microsoft.NET.Sdk">
158+
<Dependency Name="Microsoft.Build" Version="17.11.48" CoherentParentDependency="Microsoft.NET.Sdk">
159159
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
160-
<Sha>aa888d3214e5adb503c48c3bad2bfc6c5aff638a</Sha>
160+
<Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
161161
</Dependency>
162-
<Dependency Name="NuGet.Build.Tasks" Version="6.10.2-rc.8" CoherentParentDependency="Microsoft.NET.Sdk">
162+
<Dependency Name="NuGet.Build.Tasks" Version="6.11.1-rc.2" CoherentParentDependency="Microsoft.NET.Sdk">
163163
<Uri>https://github.com/nuget/nuget.client</Uri>
164-
<Sha>b42cb884109d8d33c956311f1a8c89a90be0c195</Sha>
164+
<Sha>5469bd0d9de8108f15f21644759773b85471366c</Sha>
165165
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
166166
</Dependency>
167167
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">

‎eng/Versions.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<PropertyGroup>
88
<VersionMajor>8</VersionMajor>
99
<VersionMinor>0</VersionMinor>
10-
<VersionSDKMinor>3</VersionSDKMinor>
11-
<VersionFeature>20</VersionFeature>
10+
<VersionSDKMinor>4</VersionSDKMinor>
11+
<VersionFeature>17</VersionFeature>
1212
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
1313
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
1414
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
@@ -34,7 +34,7 @@
3434
<!-- Restore feeds -->
3535
<PropertyGroup Label="Restore feeds">
3636
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
37-
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">http://ci.dot.net/public/</DotNetAssetRootUrl>
37+
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://ci.dot.net/public/</DotNetAssetRootUrl>
3838
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
3939
</PropertyGroup>
4040
<PropertyGroup>
@@ -77,16 +77,16 @@
7777
</PropertyGroup>
7878
<PropertyGroup>
7979
<!-- Dependencies from https://github.com/dotnet/sdk -->
80-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.319</MicrosoftDotNetCommonItemTemplatesPackageVersion>
81-
<MicrosoftNETSdkPackageVersion>8.0.319-servicing.25528.6</MicrosoftNETSdkPackageVersion>
82-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.319-servicing.25528.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
80+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.416</MicrosoftDotNetCommonItemTemplatesPackageVersion>
81+
<MicrosoftNETSdkPackageVersion>8.0.416-servicing.25528.7</MicrosoftNETSdkPackageVersion>
82+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.416-servicing.25528.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
8383
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
8484
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
8585
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
8686
</PropertyGroup>
8787
<PropertyGroup>
8888
<!-- Dependencies from https://github.com/dotnet/roslyn -->
89-
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-3.25064.8</MicrosoftNetCompilersToolsetPackageVersion>
89+
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-3.24554.2</MicrosoftNetCompilersToolsetPackageVersion>
9090
</PropertyGroup>
9191
<PropertyGroup>
9292
<!-- Dependencies from https://github.com/dotnet/corefx -->
@@ -122,11 +122,11 @@
122122
</PropertyGroup>
123123
<PropertyGroup>
124124
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
125-
<NuGetBuildTasksPackageVersion>6.10.2-rc.8</NuGetBuildTasksPackageVersion>
125+
<NuGetBuildTasksPackageVersion>6.11.1-rc.2</NuGetBuildTasksPackageVersion>
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/dotnet/msbuild -->
129-
<MicrosoftBuildPackageVersion>17.10.46</MicrosoftBuildPackageVersion>
129+
<MicrosoftBuildPackageVersion>17.11.48</MicrosoftBuildPackageVersion>
130130
</PropertyGroup>
131131
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
132132
<PropertyGroup>
@@ -168,7 +168,7 @@
168168
<PropertyGroup>
169169
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
170170
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
171-
<MicrosoftNETTestSdkVersion>17.10.0-release-24317-02</MicrosoftNETTestSdkVersion>
171+
<MicrosoftNETTestSdkVersion>17.11.1-release-24455-02</MicrosoftNETTestSdkVersion>
172172
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
173173
</PropertyGroup>
174174
<!-- Workload manifest package versions -->

‎es-metadata.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
schemaVersion: 0.0.1
2+
isProduction: true
3+
accountableOwners:
4+
service: 30f635d8-2918-48af-8ddf-d9bc854b7584
5+
routing:
6+
defaultAreaPath:
7+
org: devdiv
8+
path: DevDiv\NET Tools\SDK

‎github-merge-flow.jsonc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// IMPORTANT: This file is read by the merge flow from main branch only.
2+
{
3+
"merge-flow-configurations": {
4+
// Automate opening PRs to merge cli release/8.0.1xx to 8.0.3xx
5+
"release/8.0.1xx":{
6+
"MergeToBranch": "release/8.0.3xx",
7+
"ExtraSwitches": "-QuietComments"
8+
},
9+
// Automate opening PRs to merge cli release/8.0.3xx to 8.0.4xx
10+
"release/8.0.3xx":{
11+
"MergeToBranch": "release/8.0.4xx",
12+
"ExtraSwitches": "-QuietComments"
13+
}
14+
}
15+
}

‎src/redist/targets/GenerateLayout.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)\</SdkOutputDirectory>
3333

3434
<InternalBuild Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">true</InternalBuild>
35-
<InternalBaseURL Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">http://ci.dot.net/internal/</InternalBaseURL>
35+
<InternalBaseURL Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">https://ci.dot.net/internal/</InternalBaseURL>
3636

3737
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</PublicBaseURL>
3838

@@ -381,10 +381,10 @@
381381
<!-- If building in product source build mode, there is no need to attempt the external URIs. These are not desired,
382382
and won't work anyway because the source build file URI doesn't use the same structure as the storage accounts.
383383
For example, the dotnetbuilds uri for 'file:///vmr/dotnet2/artifacts/obj/x64/Release/blob-feed/assets//aspnetcore_base_runtime.version'
384-
would end up 'http://ci.dot.net/public//dotnet-runtime-8.0.0-rc.1.23381.3-centos.8-x64.tar.gz'. This is
384+
would end up 'https://ci.dot.net/public//dotnet-runtime-8.0.0-rc.1.23381.3-centos.8-x64.tar.gz'. This is
385385
missing the runtime version number directory. -->
386386
<ItemGroup Condition="'$(DotNetBuildFromSourceFlavor)' != 'Product'">
387-
<UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.BaseUrl)').Replace($(PublicBaseURL), 'http://ci.dot.net/public/'))/%(ComponentToDownload.DownloadFileName)"
387+
<UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.BaseUrl)').Replace($(PublicBaseURL), 'https://ci.dot.net/public/'))/%(ComponentToDownload.DownloadFileName)"
388388
Condition="'%(ComponentToDownload.ShouldDownload)' == 'true'">
389389
<ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload>
390390
<DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>

‎src/redist/targets/GenerateRPMs.targets‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -338,17 +338,17 @@
338338

339339
<!-- Install Dependencies and SDK Packages -->
340340
<Exec Command="sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc" />
341-
<Exec Command="sudo rpm -iv $(DownloadedRuntimeDepsInstallerFile)" />
342-
<Exec Command="sudo rpm -iv $(DownloadedNetCoreAppHostPackInstallerFile)" />
343-
<Exec Command="sudo rpm -iv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
344-
<Exec Command="sudo rpm -iv $(DownloadedNetStandardTargetingPackInstallerFile)" />
345-
<Exec Command="sudo rpm -iv $(DownloadedAspNetTargetingPackInstallerFile)" />
346-
<Exec Command="sudo rpm -iv $(DownloadedSharedHostInstallerFile)" />
347-
<Exec Command="sudo rpm -iv $(DownloadedHostFxrInstallerFile)" />
348-
<Exec Command="sudo rpm -iv $(DownloadedSharedFrameworkInstallerFile)" />
341+
<Exec Command="sudo rpm -Uv $(DownloadedRuntimeDepsInstallerFile)" />
342+
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppHostPackInstallerFile)" />
343+
<Exec Command="sudo rpm -Uv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
344+
<Exec Command="sudo rpm -Uv $(DownloadedNetStandardTargetingPackInstallerFile)" />
345+
<Exec Command="sudo rpm -Uv $(DownloadedAspNetTargetingPackInstallerFile)" />
346+
<Exec Command="sudo rpm -Uv $(DownloadedSharedHostInstallerFile)" />
347+
<Exec Command="sudo rpm -Uv $(DownloadedHostFxrInstallerFile)" />
348+
<Exec Command="sudo rpm -Uv $(DownloadedSharedFrameworkInstallerFile)" />
349349
<!-- Ignore dependencies, which may have an incoherent dependency on dotnet-runtime -->
350-
<Exec Command="sudo rpm -iv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
351-
<Exec Command="sudo rpm -iv $(SdkRPMInstallerFile)" />
350+
<Exec Command="sudo rpm -Uv --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
351+
<Exec Command="sudo rpm -Uv $(SdkRPMInstallerFile)" />
352352

353353
<!-- Run End-2-end Tests https://github.com/dotnet/core-sdk/issues/1174
354354
<DotNetRestore ProjectPath="$(EndToEndTestProject)"

0 commit comments

Comments
 (0)