Skip to content

Move runtimeconfig.template.json stuff to csproj #74124

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

Merged
MichalStrehovsky merged 3 commits into from
Aug 18, 2022
Merged

Move runtimeconfig.template.json stuff to csproj #74124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90a0df6
Move runtimeconfig.template.json stuff to csproj
MichalStrehovsky Aug 18, 2022
10e6c8a
It wasn't just one
MichalStrehovsky Aug 18, 2022
68310fe
Update src/libraries/System.Resources.ResourceManager/tests/System.Re…
jkotas Aug 18, 2022
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
Next Next commit
Move runtimeconfig.template.json stuff to csproj 
NativeAOT ignores this and emits a warning. This fails the test build.
  • Loading branch information
@MichalStrehovsky
MichalStrehovsky committed Aug 18, 2022
commit 90a0df672d6bbdb18a8ec363cf851b9f5770965a
3 changes: 3 additions & 0 deletions ...ries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
<!--Reference to System.Resources.Extensions is required in order to be able to embed a resource that requires a custom reader-->
<ProjectReference Include="$(LibrariesProjectRoot)System.Resources.Extensions\src\System.Resources.Extensions.csproj" />
</ItemGroup>
<ItemGroup>
<RuntimeHostConfigurationOption Include="System.Drawing.EnableUnixSupport" Value="true" />
</ItemGroup>
<!--
MSBuild on .NET Core doesn't support non-string resources. See https://github.com/Microsoft/msbuild/issues/2221
Workaround this for now by invoking the desktop resgen.exe on Windows manually to regenerate the resource files.
Expand Down
5 changes: 0 additions & 5 deletions src/libraries/System.Resources.ResourceManager/tests/runtimeconfig.template.json
View file
Open in desktop

This file was deleted.