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

Update SDK #48908

Merged
merged 8 commits into from
Jun 24, 2023
Merged

Update SDK #48908

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f76362
Update SDK
RussKie Jun 20, 2023
8b17dee
Fix trimming annotation error
SteveSandersonMS Jun 22, 2023
47f5966
Supress RID resolution warning
SteveSandersonMS Jun 22, 2023
3755745
Update SDK further to get fix https://github.com/dotnet/runtime/pull/…
SteveSandersonMS Jun 22, 2023
56d8310
Attempted further workaround
SteveSandersonMS Jun 22, 2023
db226bb
Revert attempted workaround that didn't work
SteveSandersonMS Jun 22, 2023
9db37bd
Disable RID check in templates with SQLite
captainsafia Jun 23, 2023
719fc18
Try different location for RID workaround
halter73 Jun 24, 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
5 changes: 5 additions & 0 deletions src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,10 @@
<PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="${MicrosoftIdentityWebDownstreamApiVersion}" Condition=" '$(IndividualB2CAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
</ItemGroup>

<!-- Temporarily ignore RID-related warnings. -->
<ItemGroup>
<RuntimeHostConfigurationOption Include="System.Runtime.Loader.UseRidGraph" Value="true" />
</ItemGroup>
Copy link
Member

Choose a reason for hiding this comment

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

This will actually show up in people's real apps when they create them, won't it? Is that OK?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, it will. I gave this a try largely to see if this is the only remaining issue with this SDK update or if we might have to onion peel on another item.

As to whether or not it is OK, it appears that the right thing to do is resolve the underlying issue is resolve ericsink/SQLitePCL.raw#543.

Given that we've branched for preview7 already, I was assuming that it was OK to take this in as we have some runaway to land a fix in preview7.

@bricelam Thoughts on feasibility of getting a fix for the underlying issue?

Copy link
Member

Choose a reason for hiding this comment

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

It looks like we'll also need to fix templates in the spa-templates repo. :/

I'm fine to pursue this assuming we think we can land a permanent fix for preview7 or there isn't a way to address this that is more hidden from the user.


<!--#endif -->
</Project>
5 changes: 5 additions & 0 deletions src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,10 @@
<PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="${MicrosoftIdentityWebDownstreamApiVersion}" Condition=" '$(IndividualB2CAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
</ItemGroup>

<!-- Temporarily ignore RID-related warnings. -->
<ItemGroup>
<RuntimeHostConfigurationOption Include="System.Runtime.Loader.UseRidGraph" Value="true" />
</ItemGroup>

<!--#endif -->
</Project>