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.

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

[main] Update dependencies from 9 repositories #93337

Merged
merged 68 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
caed1f7
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 11, 2023
2b82c1a
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 11, 2023
fcb8f28
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Oct 11, 2023
ce41116
Update dependencies from https://github.com/dotnet/icu build 20231009.3
dotnet-maestro[bot] Oct 11, 2023
b4fe686
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Oct 11, 2023
f6bda9d
Update dependencies from https://github.com/dotnet/cecil build 202310…
dotnet-maestro[bot] Oct 11, 2023
95e83e2
Update dependencies from https://github.com/dotnet/sdk build 20231011.2
dotnet-maestro[bot] Oct 11, 2023
e6aa057
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 12, 2023
0f3cdb4
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 12, 2023
54ed8e6
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Oct 12, 2023
e1195d0
Update dependencies from https://github.com/dotnet/icu build 20231009.3
dotnet-maestro[bot] Oct 12, 2023
82ef0cd
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Oct 12, 2023
b387f16
Update dependencies from https://github.com/dotnet/cecil build 202310…
dotnet-maestro[bot] Oct 12, 2023
3c828e9
Update dependencies from https://github.com/dotnet/sdk build 20231012.4
dotnet-maestro[bot] Oct 12, 2023
e646caf
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 13, 2023
713a7e3
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 13, 2023
98db1a7
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Oct 13, 2023
a3dba55
Update dependencies from https://github.com/dotnet/icu build 20231009.3
dotnet-maestro[bot] Oct 13, 2023
d21e847
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Oct 13, 2023
ccdf798
Update dependencies from https://github.com/dotnet/cecil build 202310…
dotnet-maestro[bot] Oct 13, 2023
5939c3f
Update dependencies from https://github.com/dotnet/sdk build 20231013.1
dotnet-maestro[bot] Oct 13, 2023
796d6c6
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 14, 2023
790523f
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 14, 2023
353fb80
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Oct 14, 2023
3d1fae2
Update dependencies from https://github.com/dotnet/icu build 20231009.3
dotnet-maestro[bot] Oct 14, 2023
eb58c3c
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Oct 14, 2023
0af4f95
Update dependencies from https://github.com/dotnet/cecil build 202310…
dotnet-maestro[bot] Oct 14, 2023
2ae06a8
Update dependencies from https://github.com/dotnet/sdk build 20231013.18
dotnet-maestro[bot] Oct 14, 2023
fe7ba0b
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 15, 2023
cf3c041
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 15, 2023
05075b1
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Oct 15, 2023
0c0deb3
Update dependencies from https://github.com/dotnet/icu build 20231009.3
dotnet-maestro[bot] Oct 15, 2023
1c45857
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Oct 15, 2023
7e0b1dc
Update dependencies from https://github.com/dotnet/cecil build 202310…
dotnet-maestro[bot] Oct 15, 2023
5006bce
Update dependencies from https://github.com/dotnet/sdk build 20231013.18
dotnet-maestro[bot] Oct 15, 2023
a5d2f06
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 16, 2023
1c0e917
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 16, 2023
9c2f278
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Oct 16, 2023
9fe3ed3
Update dependencies from https://github.com/dotnet/icu build 20231009.3
dotnet-maestro[bot] Oct 16, 2023
c26e597
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Oct 16, 2023
deffde8
Update dependencies from https://github.com/dotnet/cecil build 202310…
dotnet-maestro[bot] Oct 16, 2023
c0ff75e
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Oct 16, 2023
2cc4154
Update dependencies from https://github.com/dotnet/sdk build 20231016.1
dotnet-maestro[bot] Oct 16, 2023
120e064
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Oct 16, 2023
9728d34
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 17, 2023
64c4cb6
Update dependencies from https://github.com/dotnet/icu build 20231009.3
dotnet-maestro[bot] Oct 17, 2023
2af6bc6
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 17, 2023
883ad4b
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Oct 17, 2023
5dc0dda
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Oct 17, 2023
b8830a3
Update dependencies from https://github.com/dotnet/cecil build 202310…
dotnet-maestro[bot] Oct 17, 2023
8e026fc
Update dependencies from https://github.com/dotnet/sdk build 20231017.7
dotnet-maestro[bot] Oct 17, 2023
ce28819
Merge branch 'main' into darc-main-6ea55d38-9cbf-42e7-b639-b08987bfd6a4
radical Oct 18, 2023
c72c0cf
Update Versions.props
ViktorHofer Oct 18, 2023
adb1865
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 18, 2023
65e10e8
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 18, 2023
5c8a94d
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Oct 18, 2023
2fbb576
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Oct 18, 2023
c71caaf
Update dependencies from https://github.com/dotnet/sdk build 20231018.7
dotnet-maestro[bot] Oct 18, 2023
24c2e65
workloads-testing.targets: Install latest 8.0 shared framework
radical Oct 18, 2023
7e40797
fix merge
radical Oct 18, 2023
e8d1aa4
fix command line for windows
radical Oct 18, 2023
d706673
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 19, 2023
31e0ff6
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 19, 2023
795e144
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Oct 19, 2023
89ecf23
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Oct 19, 2023
3243a33
Update dependencies from https://github.com/dotnet/sdk build 20231019.18
dotnet-maestro[bot] Oct 19, 2023
19c4d8a
Mark the failing HttpMetrics test as active issue for now
lewing Oct 19, 2023
3901238
Temporary build break fix
jkotas Oct 20, 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
21 changes: 11 additions & 10 deletions eng/testing/workloads-testing.targets
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<InstallWorkloadUsingArtifactsDependsOn>
$(InstallWorkloadUsingArtifactsDependsOn);
_ProvisionDotNetForWorkloadTesting;
_InstallSharedFrameworksForWorkloadTesting;
_GetDotNetVersion;
_SetPackageVersionForWorkloadsTesting;
GetNuGetsToBuildForWorkloadTesting;
Expand All @@ -23,9 +24,10 @@
</PropertyGroup>

<ItemGroup>
<!--<AdditionalSharedFrameworkToInstallArguments Include="-Version 8.0.0-rc.2.23457.7" />-->
<!-- Required for running apps built with 9.0 sdk, but the sdk does
not yet support *running* with 9.0 sdk -->
<AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />
<AdditionalSharedFrameworkToInstallArguments Include="-Version latest -c 8.0 -q daily" />

<_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
<_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
Expand Down Expand Up @@ -83,18 +85,17 @@
IgnoreStandardErrorWarningFormat="true"
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />

<!-- Install additional shared frameworks -->
<PropertyGroup>
<_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
</PropertyGroup>
<Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
<Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
</Target>

<!-- TODO: stamps -->
<Target Name="_InstallSharedFrameworksForWorkloadTesting">
<Exec Condition="'%(AdditionalSharedFrameworkToInstallArguments.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
IgnoreStandardErrorWarningFormat="true"
Command="$(_DotNetInstallCommand)" />
Command="$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles %(AdditionalSharedFrameworkToInstallArguments.Identity)" />

<Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
<Exec Condition="'%(AdditionalSharedFrameworkToInstallArguments.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
IgnoreStandardErrorWarningFormat="true"
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles %(AdditionalSharedFrameworkToInstallArguments.Identity)"' />
</Target>

<Target Name="_GetDotNetVersion">
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100-rtm.23506.1",
"version": "8.0.100-preview.7.12",
lewing marked this conversation as resolved.
Show resolved Hide resolved
"allowPrerelease": true,
"rollForward": "major"
},
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class BuildEnvironment
public static readonly string RelativeTestAssetsPath = @"..\testassets\";
public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");
public static readonly string TmpPath = Path.Combine("/tmp", "wbt");

public static readonly string DefaultRuntimeIdentifier =
#if TARGET_WASI
Expand Down
Loading