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 dotnet/installer #93066

Merged
merged 22 commits into from
Oct 17, 2023
Merged

[main] Update dependencies from dotnet/installer #93066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
48fbf9a
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 5, 2023
8cfb56f
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 6, 2023
d0141eb
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 7, 2023
9337be0
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 8, 2023
593f5e5
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 9, 2023
84390ea
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 10, 2023
2936781
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 11, 2023
25961d1
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 12, 2023
c04ad79
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 12, 2023
795671e
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 13, 2023
c32c9af
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 14, 2023
0849b81
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 16, 2023
74f599f
Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…
radical Oct 16, 2023
841c31b
wip
radical Oct 16, 2023
535d740
wip
radical Oct 17, 2023
d93afc5
wip
radical Oct 17, 2023
d76a4b0
wip
radical Oct 17, 2023
89a3883
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 17, 2023
015a41d
Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…
radical Oct 17, 2023
689bede
revert tfm=net9.0 changes
radical Oct 17, 2023
28cf02d
[wasm] WBT: Update blazor tests to track changed path for Pages
radical Oct 17, 2023
f408dcc
add comment
radical Oct 17, 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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,9 @@
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
<Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
<!-- installer version, for testing workloads -->
<MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
<MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
</PropertyGroup>
</Project>
17 changes: 17 additions & 0 deletions eng/testing/workloads-testing.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
</PropertyGroup>

<ItemGroup>
<!-- 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" />

<_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
<_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
<_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
Expand Down Expand Up @@ -78,6 +82,19 @@
<Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
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'))"
IgnoreStandardErrorWarningFormat="true"
Command="$(_DotNetInstallCommand)" />

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

<Target Name="_GetDotNetVersion">
Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static class MyDllImports
public static extern int cpp_add(int a, int b);
}}";

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

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

private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
{
string additionalCode = $$"""
<p role="{{methodName}}">Output: @outputText</p>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
if (invariant)
AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");

string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
string allText = File.ReadAllText(counterPath);
string ccText = "currentCount++;";
if (allText.IndexOf(ccText) < 0)
Expand Down
Loading