Skip to content

Commit 82c936b

Browse files
dotnet-maestro[bot]radical
dotnet-maestro[bot]
and
radical
authored
[main] Update dependencies from dotnet/installer (#93066)
* Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231004.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23504.14 * Update dependencies from https://github.com/dotnet/installer build 20231010.1 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23510.1 * Update dependencies from https://github.com/dotnet/installer build 20231011.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23511.2 * Update dependencies from https://github.com/dotnet/installer build 20231011.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23511.2 * Update dependencies from https://github.com/dotnet/installer build 20231012.15 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23512.15 * Update dependencies from https://github.com/dotnet/installer build 20231012.15 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23512.15 * Update dependencies from https://github.com/dotnet/installer build 20231012.15 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23512.15 * Update dependencies from https://github.com/dotnet/installer build 20231012.15 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.23503.1 -> To Version 9.0.100-alpha.1.23512.15 * [wasm] WBT: Update blazor tests to track changed path for Pages .. from `Pages/` to `Components/Pages/`. * add comment --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Ankit Jain <radical@gmail.com>
1 parent c657cb0 commit 82c936b

File tree

5 files changed

+23
-6
lines changed

5 files changed

+23
-6
lines changed

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,9 @@
398398
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
399399
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
401+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
402402
<Uri>https://github.com/dotnet/installer</Uri>
403-
<Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
403+
<Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
404404
</Dependency>
405405
</ToolsetDependencies>
406406
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
252252
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
253253
<!-- installer version, for testing workloads -->
254-
<MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
254+
<MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
255255
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
256256
</PropertyGroup>
257257
</Project>

‎eng/testing/workloads-testing.targets

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26+
<!-- Required for running apps built with 9.0 sdk, but the sdk does
27+
not yet support *running* with 9.0 sdk -->
28+
<AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />
29+
2630
<_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
2731
<_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
2832
<_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
@@ -78,6 +82,19 @@
7882
<Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
7983
IgnoreStandardErrorWarningFormat="true"
8084
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
85+
86+
<!-- Install additional shared frameworks -->
87+
<PropertyGroup>
88+
<_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
89+
</PropertyGroup>
90+
<Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
91+
<Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
92+
IgnoreStandardErrorWarningFormat="true"
93+
Command="$(_DotNetInstallCommand)" />
94+
95+
<Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
96+
IgnoreStandardErrorWarningFormat="true"
97+
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
8198
</Target>
8299

83100
<Target Name="_GetDotNetVersion">

‎src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static class MyDllImports
6363
public static extern int cpp_add(int a, int b);
6464
}}";
6565

66-
File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
66+
File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);
6767

6868
AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
6969
BlazorAddRazorButton("cpp_add", """
@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
144144
Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
145145
}
146146

147-
private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
147+
private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
148148
{
149149
string additionalCode = $$"""
150150
<p role="{{methodName}}">Output: @outputText</p>

‎src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
8484
if (invariant)
8585
AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");
8686

87-
string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
87+
string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
8888
string allText = File.ReadAllText(counterPath);
8989
string ccText = "currentCount++;";
9090
if (allText.IndexOf(ccText) < 0)

0 commit comments

Comments
 (0)