Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from 10 repositories #88245

Merged
merged 45 commits into from
Jul 13, 2023
Merged

[main] Update dependencies from 10 repositories #88245

Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
81c45c8
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 30, 2023
cca058f
Update dependencies from https://github.com/dotnet/sdk build 20230630.3
dotnet-maestro[bot] Jun 30, 2023
4eebbdc
Update dependencies from https://github.com/dotnet/llvm-project build…
dotnet-maestro[bot] Jun 30, 2023
7adc711
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 1, 2023
2a94302
Update dependencies from https://github.com/dotnet/sdk build 20230630.15
dotnet-maestro[bot] Jul 1, 2023
511f215
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jul 3, 2023
ffd3fab
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 4, 2023
c8737f6
Update dependencies from https://github.com/dotnet/icu build 20230703.1
dotnet-maestro[bot] Jul 4, 2023
219f876
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Jul 4, 2023
2fe80bd
Update dependencies from https://github.com/dotnet/sdk build 20230704.2
dotnet-maestro[bot] Jul 4, 2023
3758dce
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Jul 5, 2023
e4bbc78
Update dependencies from https://github.com/dotnet/emsdk build 202307…
dotnet-maestro[bot] Jul 5, 2023
ba2081a
Update dependencies from https://github.com/dotnet/sdk build 20230705.4
dotnet-maestro[bot] Jul 5, 2023
2a59cfe
Update dependencies from https://github.com/dotnet/sdk build 20230706.6
dotnet-maestro[bot] Jul 6, 2023
71ba417
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 7, 2023
72b6cc3
Update dependencies from https://github.com/dotnet/sdk build 20230707.1
dotnet-maestro[bot] Jul 7, 2023
444da9f
Merge branch 'main' into darc-main-91f3883a-a0f9-4c19-9ddb-dfd6a5991174
lewing Jul 7, 2023
3a7bfdc
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 8, 2023
ba0b5fc
Update dependencies from https://github.com/dotnet/sdk build 20230707.13
dotnet-maestro[bot] Jul 8, 2023
a7f6acc
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 10, 2023
5561a7b
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Jul 10, 2023
0f83737
Update dependencies from https://github.com/dotnet/sdk build 20230710.1
dotnet-maestro[bot] Jul 10, 2023
9d8d8c6
reenable json reflection
lewing Jul 11, 2023
81491b9
Move setting to test project template
sbomer Jul 11, 2023
fe5d8cd
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 11, 2023
298e695
Update dependencies from https://github.com/dotnet/icu build 20230710.1
dotnet-maestro[bot] Jul 11, 2023
91043f4
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jul 11, 2023
a388bbe
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Jul 11, 2023
b04e605
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Jul 11, 2023
070f5dd
Update dependencies from https://github.com/dotnet/cecil build 202307…
dotnet-maestro[bot] Jul 11, 2023
f623b90
Update dependencies from https://github.com/dotnet/sdk build 20230711.2
dotnet-maestro[bot] Jul 11, 2023
de417c9
Moving JsonSerializerIsReflectionEnabledByDefault to only be set in t…
eerhardt Jul 11, 2023
21c576c
Update Version.Details.xml
ViktorHofer Jul 11, 2023
ec69fe8
Update Versions.props
ViktorHofer Jul 11, 2023
f0cb58c
Enable the reflection serializer for EAT builds
lewing Jul 11, 2023
8ee3c49
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 12, 2023
2690b53
Update dependencies from https://github.com/dotnet/emsdk build 202307…
dotnet-maestro[bot] Jul 12, 2023
7a65acb
move the JsonSerializerIsReflectionEnabledByDefault to tests.wasm.tar…
radical Jul 12, 2023
cc76eff
[wasm] WBT: Fix breaking tests
radical Jul 12, 2023
dd4c97f
Update tests.wasm.targets
lewing Jul 12, 2023
8242ac0
[wasm] set JsonSerializerIsReflectionEnabledByDefault unconditionally
radical Jul 12, 2023
569f285
Update eng/testing/tests.wasm.targets
radical Jul 12, 2023
7893db3
Json Trimming tests use DisabledProperties
eerhardt Jul 12, 2023
399407c
[wasm] WBT: Set DOTNET_ROOT for tests
radical Jul 12, 2023
3137ba3
[wasm] WBT: Set DOTNET_ROOT explicitly in the helix environment
radical Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "8.0.0-prerelease.23326.1",
"version": "8.0.0-prerelease.23360.3",
"commands": [
"xharness"
]
Expand Down
188 changes: 94 additions & 94 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

81 changes: 41 additions & 40 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,27 +83,28 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23328.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23328.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23328.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23328.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23328.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23328.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23328.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23328.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23328.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23328.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23328.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23328.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23328.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23328.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23328.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23361.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23361.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23361.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23361.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23361.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23361.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23361.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23361.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.7.23325.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.7.23359.3</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>8.0.0-preview.7.23359.3</MicrosoftNETCoreILAsmVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this change added a second ILAsm property. After this darc is only updating the first one, which gets overwritten by the second.

<MicrosoftNETCoreILAsmVersion>8.0.0-preview.7.23325.2</MicrosoftNETCoreILAsmVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.23354.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>16.0.5-alpha.1.23354.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
Expand Down Expand Up @@ -131,27 +132,27 @@
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
<SystemTextJsonVersion>8.0.0-preview.7.23325.2</SystemTextJsonVersion>
<SystemTextJsonVersion>8.0.0-preview.7.23359.3</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>8.0.0-preview.7.23325.2</runtimenativeSystemIOPortsVersion>
<runtimenativeSystemIOPortsVersion>8.0.0-preview.7.23359.3</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.23326.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.23326.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>8.0.0-beta.23326.1</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>8.0.0-beta.23326.1</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>8.0.0-beta.23326.1</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>8.0.0-beta.23326.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>8.0.0-beta.23326.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>8.0.0-beta.23326.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.23326.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.23326.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.23326.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.23326.1</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.23326.1</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.23326.1</MicrosoftDotNetCilStripSourcesVersion>
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.23360.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.23360.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>8.0.0-beta.23360.1</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>8.0.0-beta.23360.1</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>8.0.0-beta.23360.1</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>8.0.0-beta.23360.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>8.0.0-beta.23360.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>8.0.0-beta.23360.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.23360.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.23360.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.23360.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.23360.1</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.23360.1</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.23360.1</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23354.4</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23354.4</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand All @@ -178,10 +179,10 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23326.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23326.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23326.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.23326.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23360.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23360.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23360.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.23360.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
Expand All @@ -208,11 +209,11 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20221010.1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>8.0.0-preview.7.23325.2</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkTasksVersion>8.0.0-preview.7.23359.3</MicrosoftNETILLinkTasksVersion>
<!-- Mono Cecil -->
<MicrosoftDotNetCecilVersion>0.11.4-alpha.23327.1</MicrosoftDotNetCecilVersion>
<MicrosoftDotNetCecilVersion>0.11.4-alpha.23360.2</MicrosoftDotNetCecilVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-preview.7.23326.2</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-preview.7.23360.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<MicrosoftNativeQuicMsQuicVersion>2.1.7</MicrosoftNativeQuicMsQuicVersion>
<SystemNetMsQuicTransportVersion>8.0.0-alpha.1.23180.2</SystemNetMsQuicTransportVersion>
Expand All @@ -235,7 +236,7 @@
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
-->
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23326.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23361.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
1 change: 1 addition & 0 deletions eng/testing/tests.wasm.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<WasmDebugLevel Condition="'$(DebuggerSupport)' == 'true' and '$(ContinuousIntegrationBuild)' == 'true' and '$(WasmDebugLevel)' == ''">reset-to-zero</WasmDebugLevel>

<TrimMode Condition="'$(TrimMode)' == ''">full</TrimMode>
<JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
radical marked this conversation as resolved.
Show resolved Hide resolved

<!-- Some tests expect to load satellite assemblies by path, eg. System.Runtime.Loader.Tests,
so, just setting it true by default -->
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"dotnet": "8.0.100-preview.5.23303.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23328.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23328.2",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23328.2",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23361.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23361.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23361.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-preview.7.23325.2"
"Microsoft.NET.Sdk.IL": "8.0.0-preview.7.23359.3"
}
}
8 changes: 8 additions & 0 deletions ....Text.Json/tests/System.Text.Json.Tests/TrimmingTests/System.Text.Json.TrimmingTests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@
<TestConsoleAppSourceFiles Include="EnumConverterTest.cs" />
<TestConsoleAppSourceFiles Include="JsonConverterAttributeTest.cs" />
<TestConsoleAppSourceFiles Include="StackOrQueueNotRootedTest.cs" />
</ItemGroup>

<!-- All tests declared above rely on JsonSerializerIsReflectionEnabledByDefault behavior.-->
<ItemGroup>
<TestConsoleAppSourceFiles Update="@(TestConsoleAppSourceFiles)" EnabledProperties="JsonSerializerIsReflectionEnabledByDefault" />
</ItemGroup>

<ItemGroup>
<TestConsoleAppSourceFiles Include="IsReflectionEnabledByDefaultFalse.cs">
<DisabledFeatureSwitches>System.Text.Json.JsonSerializer.IsReflectionEnabledByDefault</DisabledFeatureSwitches>
eerhardt marked this conversation as resolved.
Show resolved Hide resolved
</TestConsoleAppSourceFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/Wasm.Build.Tests/Common/RunCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class RunCommand : DotNetCommand
public RunCommand(BuildEnvironment buildEnv, ITestOutputHelper _testOutput, string label="") : base(buildEnv, _testOutput, false, label)
{
WithEnvironmentVariables(buildEnv.EnvVars);
WithEnvironmentVariable("DOTNET_ROOT", buildEnv.DotNet);
WithEnvironmentVariable("DOTNET_ROOT", Path.GetDirectoryName(buildEnv.DotNet)!);
WithEnvironmentVariable("DOTNET_INSTALL_DIR", Path.GetDirectoryName(buildEnv.DotNet)!);
WithEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0");
WithEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1");
Expand Down