-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Target net11.0 / .NET 11 #121853
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
base: main
Are you sure you want to change the base?
Target net11.0 / .NET 11 #121853
Conversation
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure |
|
@ViktorHofer, does it depend on dotnet/dotnet#2271? |
|
Not necessarily but it would be better to get that in first. I included the branding update in this PR (see eng/Versions.props changes). |
Need this property: https://github.com/dotnet/runtime/blob/69310d88a431951addcc65ad093ea59528f80c48/Directory.Build.targets#L56C6-L56C30 |
--- a/src/native/managed/cdac/Directory.Build.props
+++ b/src/native/managed/cdac/Directory.Build.props
@@ -1,5 +1,11 @@
<Project>
<Import Project="..\Directory.Build.props" />
+
+ <PropertyGroup>
+ <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+ <AppendTargetFrameworkToOutputPath Condition="'$(BuildingInsideVisualStudio)' == 'true'">true</AppendTargetFrameworkToOutputPath>
+ </PropertyGroup>
+
<ItemGroup>
<AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExperimentalAttribute">
<_Parameter1>NETCDAC0001</_Parameter1> |
|
I didn't asked to move it out, I meant to add it in cDAC 🙂 |
Bad use of words - meant the same thing. |
|
I didn't find that change pushed in this PR. Did you tried it locally on some community platform? Could you show the command (or just push to branch so we can see the error in CI). |
I tried it locally on cross building freebsd. Same exact restore error. |
|
I tested this patch am11@1cfe520 and built:
both passed the restore and cDAC package build and later failing at ApiCompat stage. The reason why I was asking you for the command or pushing the change because just like my workflow, runtime CI is also using |
Yep, unrelated: #122171 (comment) |
|
Looking at the patch, I believe @am11's patch is the right solution for the cDAC problem. |
I tried it both locally and I see @lewing pushed a change. Neither work. The |
|
#122258 has sdk branding flow which will make it easier to solve the remaining workload issues here but we will keep both up to date. dotnet/sdk#52031 is in progress for the sdk |
|
@lewing, it turned out my branch was old, was based on older commit (which is why appcompat issue was present in my runs). Could you please apply: it only affects community platforms and fixes the issue. |
Thanks for the suggestion. I think I understand why it was failing earlier. runtime/eng/targetingpacks.targets Lines 19 to 23 in acfe981
If we try to change the |
|
We should update the logic to always use the local packs when UseBootstrapLayout is true. Then it should do the "right thing". |
Yup, that will resolve #115622 as well. :) |
issue to track the work is #122264
src/native/managed/cdac/mscordaccore_universal/mscordaccore_universal.csproj
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Delete?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these translation files needed?
…iversal.csproj Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
…ion upgrades It is tempting to read the version from an environment variable, but this breaks scenarios where we do a major version upgrade (e.g., net10.0 to net11.0) because we may be running the test build from an older runtime.
| private static readonly string s_latestTargetFramework = $"net{Environment.Version.Major}.0"; | ||
| private static readonly string s_previousTargetFramework = $"net{Environment.Version.Major - 1}.0"; | ||
| // are really the previous version. | ||
| private static readonly int TargetMajorVersion = 11; /* net11 */ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
private const int?
Contributes to #118583
For reference, this was last year's PR for net10.0. #106599