diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dd7101ab3fbad..8ebe3b0ab4d923 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - e97027cf100d2b532adce387e5cb93a373de93c9 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 https://github.com/microsoft/vstest @@ -198,9 +198,9 @@ https://github.com/dotnet/xharness e5511489deb44b13418fe622775bd7035e21c5ae - + https://github.com/dotnet/arcade - 6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1 + 6224d1b573b73caaa84176bd83dabe75f202cdc7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index d928ac87ece65d..e4f60d6dd5cd00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 3.10.0 6.0.0-rc1.21362.2 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 2.5.1-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21369.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 - 6.0.0-beta.21364.3 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 2.5.1-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 + 6.0.0-beta.21372.16 6.0.0-preview.1.102 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index e20637ed6a177d..705b7a1c847b99 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -29,6 +29,11 @@ steps: officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' fi + internalRuntimeDownloadArgs= + if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then + internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + fi + targetRidArgs= if [ '${{ parameters.platform.targetRID }}' != '' ]; then targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' @@ -43,6 +48,7 @@ steps: --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ $officialBuildArgs \ + $internalRuntimeDownloadArgs \ $targetRidArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets index 649ad3e25bf2d9..e31fc4e0acdbba 100644 --- a/eng/testing/linker/trimmingTests.targets +++ b/eng/testing/linker/trimmingTests.targets @@ -42,6 +42,7 @@ %(Identity) + diff --git a/global.json b/global.json index 379263436c7601..8c18acbc861ddb 100644 --- a/global.json +++ b/global.json @@ -1,22 +1,22 @@ { "sdk": { - "version": "6.0.100-preview.4.21255.9", + "version": "6.0.100-preview.6.21355.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.100-preview.4.21255.9" + "dotnet": "6.0.100-preview.6.21355.2" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21364.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21372.16", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21364.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21364.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21364.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21372.16", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21372.16", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21372.16", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21361.10" diff --git a/src/installer/tests/Assets/TestProjects/LightupClient/LightupClient.csproj b/src/installer/tests/Assets/TestProjects/LightupClient/LightupClient.csproj index f413febe3ff59a..06ac4b1d7256b9 100644 --- a/src/installer/tests/Assets/TestProjects/LightupClient/LightupClient.csproj +++ b/src/installer/tests/Assets/TestProjects/LightupClient/LightupClient.csproj @@ -4,6 +4,7 @@ $(NetCoreAppCurrent) Exe $(MNAVersion) + true diff --git a/src/installer/tests/HostActivation.Tests/PortableAppActivation.cs b/src/installer/tests/HostActivation.Tests/PortableAppActivation.cs index a2a0d963e1f094..fa3e03bd972016 100644 --- a/src/installer/tests/HostActivation.Tests/PortableAppActivation.cs +++ b/src/installer/tests/HostActivation.Tests/PortableAppActivation.cs @@ -162,7 +162,15 @@ public void Muxer_Exec_activation_of_Build_Output_Portable_DLL_with_DepsJson_Rem var fixture = sharedTestState.PortableAppFixture_Built .Copy(); + // Move the .deps.json to a subdirectory, note that in this case we have to move all of the app's dependencies + // along with it - in this case Newtonsoft.Json.dll + // For framework dependent apps (dotnet build produces those) the probing directories are: + // - The directory where the .deps.json is + // - Any framework directory var depsJson = MoveDepsJsonToSubdirectory(fixture); + File.Move( + Path.Combine(Path.GetDirectoryName(fixture.TestProject.AppDll), "Newtonsoft.Json.dll"), + Path.Combine(Path.GetDirectoryName(depsJson), "Newtonsoft.Json.dll")); var dotnet = fixture.BuiltDotnet; var appDll = fixture.TestProject.AppDll; diff --git a/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs b/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs index 3aa8886babe37d..e3dc7a14a2ee8b 100644 --- a/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs +++ b/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.AppHost.Tests/AppHostUpdateTests.cs @@ -400,7 +400,7 @@ static CoreFxFileStatusProvider() try { s_fileSystem_fileStatusField = typeof(FileSystemInfo).GetField("_fileStatus", BindingFlags.NonPublic | BindingFlags.Instance); - s_fileStatus_fileStatusField = s_fileSystem_fileStatusField.FieldType.GetField("_fileStatus", BindingFlags.NonPublic | BindingFlags.Instance); + s_fileStatus_fileStatusField = s_fileSystem_fileStatusField.FieldType.GetField("_fileCache", BindingFlags.NonPublic | BindingFlags.Instance); s_fileStatusModeField = s_fileStatus_fileStatusField.FieldType.GetField("Mode", BindingFlags.NonPublic | BindingFlags.Instance); } catch (Exception ex) diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props index ea5624a1591376..ea87a8bb8ec0e9 100644 --- a/src/mono/wasm/build/WasmApp.LocalBuild.props +++ b/src/mono/wasm/build/WasmApp.LocalBuild.props @@ -23,6 +23,7 @@ <_NetCoreAppToolCurrent>net6.0 + false diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs index a8f67d09eb689a..2212d57b2377e7 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs @@ -95,6 +95,9 @@ public BuildEnvironment() DefaultBuildArgs = $" /p:RuntimeSrcDir={solutionRoot.FullName} /p:RuntimeConfig={s_runtimeConfig} /p:EMSDK_PATH={emsdkPath} "; } + // for EMSDK runs, we don't want to get the dependencies from workloads + DefaultBuildArgs += " /p:MSBuildEnableWorkloadResolver=false"; + IsWorkload = false; DotNet = "dotnet"; EnvVars = new Dictionary() diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.props b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.props index 1a9c112e747d9b..3282feb5b35532 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.props +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/data/Local.Directory.Build.props @@ -1,5 +1,8 @@ + + false + <_WasmTargetsDir Condition="'$(RuntimeSrcDir)' != ''">$(RuntimeSrcDir)\src\mono\wasm\build\ <_WasmTargetsDir Condition="'$(WasmBuildSupportDir)' != ''">$(WasmBuildSupportDir)\wasm\ $(WasmBuildSupportDir)\emsdk\ diff --git a/src/tests/Common/CLRTest.Execute.Bash.targets b/src/tests/Common/CLRTest.Execute.Bash.targets index d44f83d4292042..7031b45d72e95b 100644 --- a/src/tests/Common/CLRTest.Execute.Bash.targets +++ b/src/tests/Common/CLRTest.Execute.Bash.targets @@ -275,7 +275,7 @@ else __Command+=" dotnet" fi -$__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` || exit $? +$__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` $(CLRTestMSBuildArgs) || exit $? ]]> diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index f00de4d102e503..6841b4938e70b2 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -149,4 +149,8 @@ as we do with many of the package versions above --> 2.1.0-preview3-26416-01 + + + /p:MSBuildEnableWorkloadResolver=false +