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

Update SDK to preview 3 release #100945

Merged
merged 5 commits into from
Apr 15, 2024
Merged

Update SDK to preview 3 release #100945

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5e6f9a
Update global.json
MichalStrehovsky Apr 12, 2024
e9a565c
Update blazor.csproj
MichalStrehovsky Apr 12, 2024
173fb1e
Delete useless `RuntimeIdentifiers`
MichalStrehovsky Apr 12, 2024
723e8cd
Fix up illinker tests
MichalStrehovsky Apr 12, 2024
a97c366
Fix two more preview1 versions
akoeplinger Apr 15, 2024
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 global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "9.0.100-preview.1.24101.2",
"version": "9.0.100-preview.3.24204.13",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "9.0.100-preview.1.24101.2"
"dotnet": "9.0.100-preview.3.24204.13"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24210.4",
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/tools/aot/ILCompiler/repro/repro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<RuntimeIdentifiers>linux-x64;win-x64;osx-x64</RuntimeIdentifiers>
<!-- FreeBSD runtime/apphost packs aren't built in the official build so only reference the RIDs when targetting FreeBSD -->
<RuntimeIdentifiers Condition="'$(TargetOS)' == 'freebsd'">$(RuntimeIdentifiers);freebsd-x64;freebsd-arm64</RuntimeIdentifiers>
<Configurations>Debug;Release;Checked</Configurations>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RunAnalyzers>false</RunAnalyzers>
Expand Down
4 changes: 2 additions & 2 deletions src/mono/sample/wasm/blazor-frame/blazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

<ItemGroup>
<!-- TODO un-pin this when it's possible -->
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.1.24081.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.1.24081.5" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.3.24172.13" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-preview.3.24172.13" PrivateAssets="all" />
Comment on lines +14 to +15
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have an issue that tracks removing these hardcodes?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have an issue that tracks removing these hardcodes?

Might want to ask that @radekdoulik @maraf @pavelsavara who were involved in the PR that introduced it; looks like this has been causing extra work when bumping the SDK since 8.0 RC1.

</ItemGroup>

</Project>
17 changes: 0 additions & 17 deletions src/tools/illink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureGuardAttribute.cs
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...ink/test/Mono.Linker.Tests.Cases.Expectations/Support/FeatureSwitchDefinitionAttribute.cs
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/FeatureGuardAttributeDataFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,3 +516,18 @@ static void RequiresUnreferencedCode () { }
static bool OtherCondition () => true;
}
}

namespace System.Diagnostics.CodeAnalysis
{
// Allow AttributeTargets.Method for testing invalid usages of a custom FeatureGuardAttribute
[AttributeUsage (AttributeTargets.Property | AttributeTargets.Method, Inherited = false, AllowMultiple = true)]
public sealed class FeatureGuardAttribute : Attribute
{
public Type FeatureType { get; }

public FeatureGuardAttribute (Type featureType)
{
FeatureType = featureType;
}
}
}
Loading