Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Add .net6.0 target to MauiCompat #1737

Merged
merged 2 commits into from
Dec 15, 2021
Merged

Add .net6.0 target to MauiCompat #1737

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b36fda
Update MauiCompat.sh
maxkoshevoi Nov 25, 2021
be1f4f6
Merge branch 'main' into mk/net6-to-compat-steps
jsuarezruiz Dec 13, 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
16 changes: 11 additions & 5 deletions MauiCompat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ dotnet sln ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat.sln add ./
dotnet new sln -o ./src/Markup/ -n Xamarin.CommunityToolkit.Markup.MauiCompat
dotnet sln ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat.sln add ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/Xamarin.CommunityToolkit.Markup.MauiCompat.csproj

sed -i '' 's/net6.0;//g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/Xamarin.CommunityToolkit.MauiCompat.csproj
sed -i '' 's/net6.0;//g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/**/Xamarin.CommunityToolkit.Markup.MauiCompat.csproj

sed -i '' 's/;net6.0-maccatalyst//g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/Xamarin.CommunityToolkit.MauiCompat.csproj
sed -i '' 's/;net6.0-maccatalyst//g' ./src/Markup/Xamarin.CommunityToolkit.Markup.MauiCompat/**/Xamarin.CommunityToolkit.Markup.MauiCompat.csproj

Expand All @@ -35,7 +32,7 @@ printf > ./src/CommunityToolkit/Directory.build.props "<Project>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageProjectUrl>https://github.com/xamarin/XamarinCommunityToolkit</PackageProjectUrl>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<Version>1.3.0-pre2</Version>
<Version>1.3.0-pre4</Version>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -67,6 +64,15 @@ printf > ./src/CommunityToolkit/Directory.build.props "<Project>
<Compile Include=\"**\*.macos.cs\" />
<Compile Include=\"**\*.macos.*.cs\" />
</ItemGroup>

<ItemGroup Condition=\" !\$(TargetFramework.Contains('-')) \">
<Compile Include=\"**\*.netstandard.cs\" />
<Compile Include=\"**\*.netstandard.*.cs\" />
</ItemGroup>
<PropertyGroup Condition=\" !\$(TargetFramework.Contains('-')) \">
<DefineConstants>\$(DefineConstants);NETSTANDARD</DefineConstants>
</PropertyGroup>

</Project>"

printf > ./src/Markup/Directory.build.props "<Project>
Expand All @@ -90,7 +96,7 @@ printf > ./src/Markup/Directory.build.props "<Project>
<Product>\$(AssemblyName) (\$(TargetFramework))</Product>
<PackageVersion>\$(Version)\$(VersionSuffix)</PackageVersion>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>1.3.0-pre2</Version>
<Version>1.3.0-pre4</Version>
<PackageTags>maui,net,xamarin,xamarin.forms,toolkit,kit,communitytoolkit,xamarincommunitytoolkit,markup,csharpformarkup,csharp,csharpmarkup</PackageTags>
</PropertyGroup>

Expand Down