Skip to content

Commit dd7c82e

Browse files
Update SDK to preview 3 release (#100945)
* Update global.json * Update blazor.csproj * Delete useless `RuntimeIdentifiers` * Fix up illinker tests * Fix two more preview1 versions --------- Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
1 parent a4f1e74 commit dd7c82e

File tree

8 files changed

+22
-43
lines changed

8 files changed

+22
-43
lines changed

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-preview.1.24101.2",
3+
"version": "9.0.100-preview.3.24204.13",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "9.0.100-preview.1.24101.2"
8+
"dotnet": "9.0.100-preview.3.24204.13"
99
},
1010
"msbuild-sdks": {
1111
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4",

src/coreclr/tools/aot/ILCompiler/repro/repro.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<PlatformTarget>AnyCPU</PlatformTarget>
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
88
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
9-
<RuntimeIdentifiers>linux-x64;win-x64;osx-x64</RuntimeIdentifiers>
10-
<!-- FreeBSD runtime/apphost packs aren't built in the official build so only reference the RIDs when targetting FreeBSD -->
11-
<RuntimeIdentifiers Condition="'$(TargetOS)' == 'freebsd'">$(RuntimeIdentifiers);freebsd-x64;freebsd-arm64</RuntimeIdentifiers>
129
<Configurations>Debug;Release;Checked</Configurations>
1310
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1411
<RunAnalyzers>false</RunAnalyzers>

src/mono/sample/wasm/blazor-frame/blazor.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<ItemGroup>
1313
<!-- TODO un-pin this when it's possible -->
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.1.24081.5" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.1.24081.5" PrivateAssets="all" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.3.24172.13" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.3.24172.13" PrivateAssets="all" />
1616
</ItemGroup>
1717

1818
</Project>

src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Client/BlazorHosted.Client.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<!-- versions are pinned but when run from WBT level, it's taking in-tree runtime -->
1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.1.24081.5" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.1.24081.5" PrivateAssets="all" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.3.24172.13" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.3.24172.13" PrivateAssets="all" />
1616
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.1" />
1717
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
1818
</ItemGroup>

src/mono/wasm/testassets/BlazorHostedApp/BlazorHosted.Server/BlazorHosted.Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-preview.1.24081.5" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-preview.3.24172.13" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureGuardAttribute.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureSwitchDefinitionAttribute.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/FeatureGuardAttributeDataFlow.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,3 +516,18 @@ static void RequiresUnreferencedCode () { }
516516
static bool OtherCondition () => true;
517517
}
518518
}
519+
520+
namespace System.Diagnostics.CodeAnalysis
521+
{
522+
// Allow AttributeTargets.Method for testing invalid usages of a custom FeatureGuardAttribute
523+
[AttributeUsage (AttributeTargets.Property | AttributeTargets.Method, Inherited = false, AllowMultiple = true)]
524+
public sealed class FeatureGuardAttribute : Attribute
525+
{
526+
public Type FeatureType { get; }
527+
528+
public FeatureGuardAttribute (Type featureType)
529+
{
530+
FeatureType = featureType;
531+
}
532+
}
533+
}

0 commit comments

Comments
 (0)