Skip to content

Commit 6ee5a67

Browse files
authored
Revert "[automated] Merge branch 'release/8.0' => 'release/8.0-staging' (#93874)"
This reverts commit 72b787f.
1 parent 72b787f commit 6ee5a67

File tree

18 files changed

+139
-179
lines changed

18 files changed

+139
-179
lines changed

NuGet.config

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
</fallbackPackageFolders>
88
<packageSources>
99
<clear />
10-
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
11-
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-51bf18a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-51bf18a2/nuget/v3/index.json" />
13-
<!-- End: Package sources from dotnet-emsdk -->
14-
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1510
<!--
1611
'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
1712
one as a template. The following line is a marker to insert the test restore sources.

eng/Version.Details.xml

+44-48
Large diffs are not rendered by default.

eng/Versions.props

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PreReleaseVersionIteration>
1414
</PreReleaseVersionIteration>
1515
<!-- Enable to remove prerelease label. -->
16-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
16+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1818
<WorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PreReleaseVersionIteration)' == ''">-$(PreReleaseVersionLabel)</WorkloadVersionSuffix>
1919
<WorkloadVersionSuffix Condition="'$(WorkloadVersionSuffix)' == '' and '$(DotNetFinalVersionKind)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
@@ -158,12 +158,12 @@
158158
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.23421.1</SystemWindowsExtensionsTestDataVersion>
159159
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.23421.1</MicrosoftDotNetCilStripSourcesVersion>
160160
<!-- dotnet-optimization dependencies -->
161-
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23521.3</optimizationwindows_ntx64MIBCRuntimeVersion>
162-
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23521.3</optimizationwindows_ntx86MIBCRuntimeVersion>
163-
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.23521.3</optimizationwindows_ntarm64MIBCRuntimeVersion>
164-
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.23521.3</optimizationlinuxx64MIBCRuntimeVersion>
165-
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23521.3</optimizationlinuxarm64MIBCRuntimeVersion>
166-
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23521.3</optimizationPGOCoreCLRVersion>
161+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23519.5</optimizationwindows_ntx64MIBCRuntimeVersion>
162+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23519.5</optimizationwindows_ntx86MIBCRuntimeVersion>
163+
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.23519.5</optimizationwindows_ntarm64MIBCRuntimeVersion>
164+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.23519.5</optimizationlinuxx64MIBCRuntimeVersion>
165+
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23519.5</optimizationlinuxarm64MIBCRuntimeVersion>
166+
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23519.5</optimizationPGOCoreCLRVersion>
167167
<!-- Not auto-updated. -->
168168
<MicrosoftDiaSymReaderNativeVersion>16.11.29-beta1.23404.4</MicrosoftDiaSymReaderNativeVersion>
169169
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
@@ -219,7 +219,7 @@
219219
<!-- ICU -->
220220
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.23511.1</MicrosoftNETCoreRuntimeICUTransportVersion>
221221
<!-- MsQuic -->
222-
<MicrosoftNativeQuicMsQuicVersion>2.2.3</MicrosoftNativeQuicMsQuicVersion>
222+
<MicrosoftNativeQuicMsQuicVersion>2.2.2</MicrosoftNativeQuicMsQuicVersion>
223223
<SystemNetMsQuicTransportVersion>8.0.0-alpha.1.23468.1</SystemNetMsQuicTransportVersion>
224224
<!-- Mono LLVM -->
225225
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>16.0.5-alpha.1.23478.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
@@ -240,8 +240,8 @@
240240
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
241241
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
242242
-->
243-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.0</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
244-
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
243+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
244+
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
245245
<!-- workloads -->
246246
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
247247
<WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>

eng/pipelines/common/xplat-setup.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
- ${{ if eq(parameters.archType, 'wasm') }}:
109109
- name: wasmDarcDependenciesChanged
110110
value: $[ or(
111-
eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100'], true),
111+
eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport'], true),
112112
eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_DotNet_Build_Tasks_Workloads'], true),
113113
eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.System_Runtime_TimeZoneData'], true),
114114
eq(dependencies.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_Net_Compilers_Toolset'], true),

eng/resolveContract.targets

+2-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@
7373
That is necessary as APICompat is invoked twice, once for the ref <-> src comparision and then again
7474
for the package validation (which doesn't include reference assemblies). As both operations don't have
7575
all the inputs available, some suppressions might only apply to one or the other and hence unnecessary
76-
suppressions can't be determined.
77-
Disable the validation under source build as that might use an out-of-date SDK and not the ApiCompat.Task package. -->
78-
<PropertyGroup Condition="('$(IsPackable)' == 'true' and '$(IsRuntimeAndReferenceAssembly)' != 'true') or '$(DotNetBuildFromSource)' == 'true'">
76+
suppressions can't be determined. -->
77+
<PropertyGroup Condition="'$(IsPackable)' == 'true' and '$(IsRuntimeAndReferenceAssembly)' != 'true'">
7978
<ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
8079
<ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
8180
</PropertyGroup>

eng/testing/performance/performance-setup.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ if ($iOSNativeAOT) {
101101
}
102102

103103
# FIX ME: This is a workaround until we get this from the actual pipeline
104-
$CleanedBranchName = "release/8.0"
104+
$CleanedBranchName = "main"
105105
if($Branch.Contains("refs/heads/release"))
106106
{
107107
$CleanedBranchName = $Branch.replace('refs/heads/', '')

eng/testing/performance/performance-setup.sh

+6-3
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,9 @@ if [[ "$physicalpromotion" == "true" ]]; then
358358
configurations="$configurations PhysicalPromotionType=physicalpromotion"
359359
fi
360360

361-
cleaned_branch_name="release/8.0"
361+
362+
363+
cleaned_branch_name="main"
362364
if [[ $branch == *"refs/heads/release"* ]]; then
363365
cleaned_branch_name=${branch/refs\/heads\//}
364366
fi
@@ -402,14 +404,15 @@ if [[ -n "$wasm_bundle_directory" ]]; then
402404
using_wasm=true
403405
wasm_bundle_directory_path=$payload_directory
404406
mv $wasm_bundle_directory/* $wasm_bundle_directory_path
405-
wasm_args="--expose_wasm"
407+
find $wasm_bundle_directory_path -type d
408+
wasm_args="--experimental-wasm-eh --expose_wasm"
406409
if [ "$javascript_engine" == "v8" ]; then
407410
# for es6 module support
408411
wasm_args="$wasm_args --module"
409412
fi
410413

411414
# Workaround: escaping the quotes around `--wasmArgs=..` so they get retained for the actual command line
412-
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmEngine /home/helixbot/.jsvu/bin/$javascript_engine \\\"--wasmArgs=$wasm_args\\\" --cli \$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet --wasmDataDir \$HELIX_CORRELATION_PAYLOAD/wasm-data"
415+
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmEngine /home/helixbot/.jsvu/bin/$javascript_engine --wasmArgs \\\"$wasm_args\\\" --cli \$HELIX_CORRELATION_PAYLOAD/dotnet/dotnet --wasmDataDir \$HELIX_CORRELATION_PAYLOAD/wasm-data"
413416
if [[ "$wasmaot" == "true" ]]; then
414417
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --aotcompilermode wasm --buildTimeout 3600"
415418
fi

src/coreclr/nativeaot/Directory.Build.props

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<!-- This prevents the default MsBuild targets from referencing System.Core.dll -->
2626
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
2727
<RuntimeMetadataVersion>v4.0.30319</RuntimeMetadataVersion>
28-
<!-- Override InformationalVersion during servicing as it's returned via public api. -->
29-
<InformationalVersion Condition="'$(PreReleaseVersionLabel)' == 'servicing'">$(ProductVersion)</InformationalVersion>
30-
<InformationalVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</InformationalVersion>
3128
<NoWarn>$(NoWarn),0419,0649,CA2249,CA1830</NoWarn>
3229

3330
<!-- Disable nullability-related warnings -->

0 commit comments

Comments
 (0)