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

Improve semicolon delimiter consistency, fix IsNetstandard property #244

Merged
merged 1 commit into from
Jan 2, 2025
Merged

Improve semicolon delimiter consistency, fix IsNetstandard property #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion MultiTarget/AvailableTargetFrameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<WpfLibTargetFrameworks Condition="'$(WpfLibTargetFrameworks)' == ''">net9.0;</WpfLibTargetFrameworks>

<!-- Used for defining TargetFramework under platforms that need it -->
<DotnetStandardCommonTargetFramework Condition="'$(DotnetStandardCommonTargetFramework)' == ''">netstandard2.0</DotnetStandardCommonTargetFramework>
<DotnetStandardCommonTargetFramework Condition="'$(DotnetStandardCommonTargetFramework)' == ''">netstandard2.0;</DotnetStandardCommonTargetFramework>
<DotnetCommonTargetFramework Condition="'$(DotnetCommonTargetFramework)' == ''">net9.0;</DotnetCommonTargetFramework>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion MultiTarget/EnabledMultiTargets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<!--Indicates which MultiTargets are enabled via UseTargetFrameworks script. -->
<!-- Do not commit changes made to default values by tooling. -->
<PropertyGroup>
<EnabledMultiTargets>wasm;uwp;netstandard</EnabledMultiTargets>
<EnabledMultiTargets>wasm;uwp;netstandard;</EnabledMultiTargets>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion MultiTarget/UseTargetFrameworks.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ else {
# When enabledMultiTargetsRegexPartial is empty, the regex will match everything.
# To work around this, check if there's anything to remove before doing it.
if ($enabledMultiTargets.Length -gt 0) {
$newFileContents = $fileContents -replace "\<EnabledMultiTargets\>(.+?)\<\/EnabledMultiTargets\>", "<EnabledMultiTargets>$enabledMultiTargets</EnabledMultiTargets>";
$newFileContents = $fileContents -replace "\<EnabledMultiTargets\>(.+?)\<\/EnabledMultiTargets\>", "<EnabledMultiTargets>$enabledMultiTargets;</EnabledMultiTargets>";
}

Set-Content -Force -Path $PSScriptRoot/EnabledMultiTargets.props -Value $newFileContents;
Expand Down
Loading