Skip to content

Commit 19f489b

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0' changes
2 parents 7fddf88 + 397f9ea commit 19f489b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2991
-1950
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "7.0.0-prerelease.24073.2",
18+
"version": "7.0.0-prerelease.24208.2",
1919
"commands": [
2020
"xharness"
2121
]

‎NuGet.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-c7ba18b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c7ba18be/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-4f16685" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4f16685f/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1515
<!--

‎THIRD-PARTY-NOTICES.TXT

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ https://github.com/madler/zlib
7373
https://zlib.net/zlib_license.html
7474

7575
/* zlib.h -- interface of the 'zlib' general purpose compression library
76-
version 1.2.13, October 13th, 2022
76+
version 1.3.1, January 22nd, 2024
7777

7878
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
7979

‎eng/Version.Details.xml

+80-80
Large diffs are not rendered by default.

‎eng/Versions.props

+38-38
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
2323
<UsingToolXliff>false</UsingToolXliff>
2424
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
25-
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.18</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26-
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.18</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
25+
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.19</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26+
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.19</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
2727
</PropertyGroup>
2828
<ItemGroup>
2929
<!-- The bands we want to produce workload manifests for -->
@@ -53,22 +53,22 @@
5353
<!-- SDK dependencies -->
5454
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
5555
<!-- Arcade dependencies -->
56-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24114.4</MicrosoftDotNetApiCompatVersion>
57-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksFeedVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.24114.4</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.24114.4</MicrosoftDotNetGenAPIVersion>
60-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.24114.4</MicrosoftDotNetGenFacadesVersion>
61-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24114.4</MicrosoftDotNetXUnitExtensionsVersion>
62-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24114.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
63-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksArchivesVersion>
64-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksInstallersVersion>
65-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksPackagingVersion>
66-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksTemplatingVersion>
68-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.24114.4</MicrosoftDotNetRemoteExecutorVersion>
70-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.24114.4</MicrosoftDotNetVersionToolsTasksVersion>
71-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.24114.4</MicrosoftDotNetPackageTestingVersion>
56+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24209.2</MicrosoftDotNetApiCompatVersion>
57+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksFeedVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.24209.2</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.24209.2</MicrosoftDotNetGenAPIVersion>
60+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.24209.2</MicrosoftDotNetGenFacadesVersion>
61+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24209.2</MicrosoftDotNetXUnitExtensionsVersion>
62+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24209.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
63+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksArchivesVersion>
64+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksInstallersVersion>
65+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksPackagingVersion>
66+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksTemplatingVersion>
68+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.24209.2</MicrosoftDotNetRemoteExecutorVersion>
70+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.24209.2</MicrosoftDotNetVersionToolsTasksVersion>
71+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.24209.2</MicrosoftDotNetPackageTestingVersion>
7272
<!-- NuGet dependencies -->
7373
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7474
<!-- Installer dependencies -->
@@ -118,20 +118,20 @@
118118
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
119119
<runtimenativeSystemIOPortsVersion>7.0.0-rc.1.22414.6</runtimenativeSystemIOPortsVersion>
120120
<!-- Runtime-Assets dependencies -->
121-
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.24115.1</SystemRuntimeNumericsTestDataVersion>
122-
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.24115.1</SystemComponentModelTypeConverterTestDataVersion>
123-
<SystemDataCommonTestDataVersion>7.0.0-beta.24115.1</SystemDataCommonTestDataVersion>
124-
<SystemDrawingCommonTestDataVersion>7.0.0-beta.24115.1</SystemDrawingCommonTestDataVersion>
125-
<SystemFormatsTarTestDataVersion>7.0.0-beta.24115.1</SystemFormatsTarTestDataVersion>
126-
<SystemIOCompressionTestDataVersion>7.0.0-beta.24115.1</SystemIOCompressionTestDataVersion>
127-
<SystemIOPackagingTestDataVersion>7.0.0-beta.24115.1</SystemIOPackagingTestDataVersion>
128-
<SystemNetTestDataVersion>7.0.0-beta.24115.1</SystemNetTestDataVersion>
129-
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.24115.1</SystemPrivateRuntimeUnicodeDataVersion>
130-
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.24115.1</SystemRuntimeTimeZoneDataVersion>
131-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.24115.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
132-
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.24115.1</SystemTextRegularExpressionsTestDataVersion>
133-
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.24115.1</SystemWindowsExtensionsTestDataVersion>
134-
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.24115.1</MicrosoftDotNetCilStripSourcesVersion>
121+
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.24211.1</SystemRuntimeNumericsTestDataVersion>
122+
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.24211.1</SystemComponentModelTypeConverterTestDataVersion>
123+
<SystemDataCommonTestDataVersion>7.0.0-beta.24211.1</SystemDataCommonTestDataVersion>
124+
<SystemDrawingCommonTestDataVersion>7.0.0-beta.24211.1</SystemDrawingCommonTestDataVersion>
125+
<SystemFormatsTarTestDataVersion>7.0.0-beta.24211.1</SystemFormatsTarTestDataVersion>
126+
<SystemIOCompressionTestDataVersion>7.0.0-beta.24211.1</SystemIOCompressionTestDataVersion>
127+
<SystemIOPackagingTestDataVersion>7.0.0-beta.24211.1</SystemIOPackagingTestDataVersion>
128+
<SystemNetTestDataVersion>7.0.0-beta.24211.1</SystemNetTestDataVersion>
129+
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.24211.1</SystemPrivateRuntimeUnicodeDataVersion>
130+
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.24211.1</SystemRuntimeTimeZoneDataVersion>
131+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.24211.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
132+
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.24211.1</SystemTextRegularExpressionsTestDataVersion>
133+
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.24211.1</SystemWindowsExtensionsTestDataVersion>
134+
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.24211.1</MicrosoftDotNetCilStripSourcesVersion>
135135
<!-- dotnet-optimization dependencies -->
136136
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx64MIBCRuntimeVersion>
137137
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -154,10 +154,10 @@
154154
<!-- Testing -->
155155
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
156156
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
157-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.24073.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
158-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.24073.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
159-
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.24073.2</MicrosoftDotNetXHarnessCLIVersion>
160-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.24060.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
157+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.24208.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
158+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.24208.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
159+
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.24208.2</MicrosoftDotNetXHarnessCLIVersion>
160+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.24211.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
161161
<XUnitVersion>2.4.2</XUnitVersion>
162162
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
163163
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -177,9 +177,9 @@
177177
<MicrosoftNETILLinkTasksVersion>7.0.100-1.23401.1</MicrosoftNETILLinkTasksVersion>
178178
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
179179
<!-- ICU -->
180-
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.24115.1</MicrosoftNETCoreRuntimeICUTransportVersion>
180+
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.24210.1</MicrosoftNETCoreRuntimeICUTransportVersion>
181181
<!-- MsQuic -->
182-
<MicrosoftNativeQuicMsQuicVersion>2.3.5</MicrosoftNativeQuicMsQuicVersion>
182+
<MicrosoftNativeQuicMsQuicSchannelVersion>2.3.5</MicrosoftNativeQuicMsQuicSchannelVersion>
183183
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22459.1</SystemNetMsQuicTransportVersion>
184184
<!-- Mono LLVM -->
185185
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.23115.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>

‎eng/common/SetupNugetSources.ps1

+13-13
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0
3535
. $PSScriptRoot\tools.ps1
3636

3737
# Add source entry to PackageSources
38-
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
38+
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
3939
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
4040

4141
if ($packageSource -eq $null)
@@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4848
else {
4949
Write-Host "Package source $SourceName already present."
5050
}
51-
52-
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
51+
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
5352
}
5453

5554
# Add a credential node for the specified source
56-
function AddCredential($creds, $source, $username, $password) {
55+
function AddCredential($creds, $source, $username, $pwd) {
5756
# Looks for credential configuration for the given SourceName. Create it if none is found.
5857
$sourceElement = $creds.SelectSingleNode($Source)
5958
if ($sourceElement -eq $null)
@@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) {
8281
$passwordElement.SetAttribute("key", "ClearTextPassword")
8382
$sourceElement.AppendChild($passwordElement) | Out-Null
8483
}
85-
$passwordElement.SetAttribute("value", $Password)
84+
85+
$passwordElement.SetAttribute("value", $pwd)
8686
}
8787

88-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
88+
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
8989
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
9090

9191
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
9292

9393
ForEach ($PackageSource in $maestroPrivateSources) {
9494
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
95-
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
95+
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
9696
}
9797
}
9898

@@ -144,13 +144,13 @@ if ($disabledSources -ne $null) {
144144
$userName = "dn-bot"
145145

146146
# Insert credential nodes for Maestro's private feeds
147-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
147+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
148148

149149
# 3.1 uses a different feed url format so it's handled differently here
150150
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
151151
if ($dotnet31Source -ne $null) {
152-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
153-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
152+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
153+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
154154
}
155155

156156
$dotnetVersions = @('5','6','7')
@@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) {
159159
$feedPrefix = "dotnet" + $dotnetVersion;
160160
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
161161
if ($dotnetSource -ne $null) {
162-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
163-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
162+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
163+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
164164
}
165165
}
166166

167-
$doc.Save($filename)
167+
$doc.Save($filename)

0 commit comments

Comments
 (0)