Skip to content

Replace and remove IL injection in PresentationCore #4911

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
merged 6 commits into from
Jul 26, 2021
Merged

Replace and remove IL injection in PresentationCore #4911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02f54a5
Use preview language version for WPF
ryalanms Jul 20, 2021
3c08769
Replace IL injection with ModuleInitializer attribute.
ryalanms Jul 23, 2021
83248bc
Remove ILTools from global.json and versions.props.
ryalanms Jul 23, 2021
c705c33
Merge branch 'main' into remove.il.injection
ryalanms Jul 23, 2021
e02521e
Only set langversion to preview for previews and release candidates. …
ryalanms Jul 23, 2021
bb1ca37
Merge branch 'remove.il.injection' of https://github.com/dotnet/wpf i…
ryalanms Jul 23, 2021
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
1 change: 0 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
<!-- These versions are specified in global.json -->
<StrawberryPerlVersion>5.28.1.1-1</StrawberryPerlVersion>
<NetFramework48RefAssembliesVersion>0.0.0.1</NetFramework48RefAssembliesVersion>
<NetFramework472IlToolsVersion>0.0.0.1</NetFramework472IlToolsVersion>
</PropertyGroup>
<!--Package names-->
<PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion eng/WpfArcadeSdk/Sdk/Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

<PropertyGroup>
<GenXmlStringTable>$(WpfArcadeSdkToolsDir)GenXmlStringTable.pl</GenXmlStringTable>
<LangVersion Condition="'$(LangVersion)'==''">9.0</LangVersion>
<LangVersion Condition="'$(LangVersion)'=='' and ($(PreReleaseVersionLabel.Contains('rc')) or $(PreReleaseVersionLabel.Contains('preview')))">preview</LangVersion>
<LangVersion Condition="'$(LangVersion)'==''">10</LangVersion>
<CLSCompliant Condition="'$(CLSCompliant)'==''">true</CLSCompliant>
<IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute )'==''">true</IncludeDllSafeSearchPathAttribute>

Expand Down
1 change: 0 additions & 1 deletion eng/WpfArcadeSdk/Sdk/Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<Import Project="$(WpfArcadeSdkToolsDir)CodeAnalysis.targets" />
<Import Project="$(WpfArcadeSdkToolsDir)Wpf.Cpp.targets" Condition="'$(MSBuildProjectExtension)'=='.vcxproj'"/>
<Import Project="$(NoTargetsTargets)" Condition="'$(NoTargets)'=='true'"/>
<Import Project="$(WpfArcadeSdkToolsDir)InjectModuleInitializer.targets" Condition="'$(InjectModuleInitializer)'=='true'"/>
<Import Project="$(WpfArcadeSdkToolsDir)TestProjects.targets" />
<Import Project="$(WpfArcadeSdkToolsDir)CreateTestPayload.targets" Condition="'$(CreateTestPayload)'=='true'"/>
<Import Project="$(WpfArcadeSdkToolsDir)GenAPI.targets"/>
Expand Down
413 changes: 0 additions & 413 deletions eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions eng/WpfArcadeSdk/tools/InjectModuleInitializer/AddModuleConstructorTask.cs
View file
Open in desktop

This file was deleted.

Loading