Merge remote-tracking branch 'origin/release/6.0.3xx'

dotnet · May 12, 2022 · 2dc6702 · 2dc6702
2 parents 6e3aab8 + f19eec2
commit 2dc6702
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets
@@ -127,7 +127,7 @@
     <PackageReference Include="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" />
   </ItemGroup>
   <ItemGroup Condition=" '$(_MauiTargetPlatformIsTizen)' == 'True' ">
-    <PackageReference Include="Tizen.UIExtensions.ElmSharp" PrivateAssets="all" />
+    <PackageReference Include="Tizen.UIExtensions.ElmSharp" />
     <PackageReference Include="Microsoft.Maui.Graphics.Skia" />
   </ItemGroup>
 </Project>
diff --git a/eng/Microsoft.Extensions.targets b/eng/Microsoft.Extensions.targets
@@ -111,7 +111,7 @@
     />
     <PackageReference
         Update="Tizen.UIExtensions.ElmSharp"
-        Version="$(SamsungTizenUIExtensionsElmSharpPackageVersion)"
+        Version="$(TizenUIExtensionsVersion)"
     />
     <PackageReference
         Update="Svg.Skia"

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -16,7 +16,6 @@
     <MicrosoftmacOSSdkPackageVersion>12.3.303</MicrosoftmacOSSdkPackageVersion>
     <MicrosofttvOSSdkPackageVersion>15.4.303</MicrosofttvOSSdkPackageVersion>
     <SamsungTizenSdkPackageVersion>7.0.300-rc.3.0</SamsungTizenSdkPackageVersion>
-    <SamsungTizenUIExtensionsElmSharpPackageVersion>0.8.0-pre1</SamsungTizenUIExtensionsElmSharpPackageVersion>
     <!-- emsdk -->
     <MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
@@ -58,6 +57,7 @@
     <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22256.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
     <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22256.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
     <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22256.2</MicrosoftDotNetXHarnessCLIVersion>
+    <TizenUIExtensionsVersion>0.8.0-pre1</TizenUIExtensionsVersion>
     <SvgSkiaVersion>0.4.1</SvgSkiaVersion>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
@@ -122,6 +122,10 @@ Task("dotnet-templates")
             } },
         };
 
+        var alsoPack = new [] {
+            "mauilib"
+        };
+
         foreach (var template in templates)
         {
             foreach (var forceDotNetBuild in new [] { true, false })
@@ -143,8 +147,20 @@ Task("dotnet-templates")
                 if (template.Value != null)
                     template.Value(projectName);
 
+                // Enable Tizen
+                ReplaceTextInFiles($"{projectName}/*.csproj",
+                    "<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->",
+                    "<TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks>");
+
                 // Build
                 RunMSBuildWithDotNet(projectName, properties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild);
+
+                // Pack
+                if (alsoPack.Contains(templateName)) {
+                    var packProperties = new Dictionary<string, string>(properties);
+                    packProperties["PackageVersion"] = FileReadText("GitInfo.txt").Trim();
+                    RunMSBuildWithDotNet(projectName, packProperties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild, target: "Pack");
+                }
             }
         }
 

diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj
@@ -20,9 +20,6 @@
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
     <PackageReference Include="Xamarin.Android.Glide" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('tizen'))">
-    <PackageReference Include="Microsoft.Maui.Graphics.Skia" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Essentials\src\Essentials.csproj" />
   </ItemGroup>

diff --git a/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj b/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj
@@ -34,6 +34,7 @@
     <PackageReference Include="Microsoft.Graphics.Win2D" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'tizen'" >
+    <PackageReference Include="Tizen.UIExtensions.ElmSharp" />
     <PackageReference Include="Microsoft.Maui.Graphics.Skia" />
   </ItemGroup>
 

diff --git a/src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj b/src/Workload/Microsoft.Maui.Sdk/Microsoft.Maui.Sdk.csproj
@@ -80,12 +80,6 @@
         OldValue="@MicrosoftWindowsSDKBuildToolsPackageVersion@"
         NewValue="$(MicrosoftWindowsSDKBuildToolsPackageVersion)"
     />
-    <ReplaceText
-        Input="$(IntermediateOutputPath)BundledVersions.targets"
-        Output="$(IntermediateOutputPath)BundledVersions.targets"
-        OldValue="@SamsungTizenUIExtensionsElmSharpPackageVersion@"
-        NewValue="$(SamsungTizenUIExtensionsElmSharpPackageVersion)"
-    />
     <ItemGroup>
       <None
           Include="$(IntermediateOutputPath)BundledVersions.targets"

diff --git a/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets b/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets
@@ -72,8 +72,5 @@
   <ItemGroup Condition=" ('$(UseMaui)' == 'true' or '$(UseMauiCore)' == 'true') and ('$(TargetPlatformIdentifier)' == 'windows') ">
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="@MicrosoftWindowsSDKBuildToolsPackageVersion@" IsImplicitlyDefined="true" PrivateAssets="all" />
   </ItemGroup>
-  <ItemGroup Condition=" ('$(UseMaui)' == 'true' or '$(UseMauiCore)' == 'true') and ('$(TargetPlatformIdentifier)' == 'tizen') ">
-    <PackageReference Include="Tizen.UIExtensions.ElmSharp" Version="@SamsungTizenUIExtensionsElmSharpPackageVersion@" IsImplicitlyDefined="true" />
-  </ItemGroup>
 
 </Project>