From b5e2623fe93d1cd1d1739530352cdc573c7cdbbd Mon Sep 17 00:00:00 2001
From: btiteux <titeux.benjamin@outlook.com>
Date: Sun, 26 May 2024 19:11:46 +0200
Subject: [PATCH 1/2] try to fix typescript compile bug

---
 init.ps1                                         |  9 ++++++++-
 package.json                                     |  5 +++++
 src/Directory.Packages.props                     | 10 +++++-----
 src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj |  3 ---
 4 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 package.json

diff --git a/init.ps1 b/init.ps1
index e0567d4ea1..2b562c6178 100755
--- a/init.ps1
+++ b/init.ps1
@@ -25,4 +25,11 @@ Write-Host "Restoring Monaco Editor"
 ExecSafe { & $PSScriptRoot\tools\Restore-MonacoEditor.ps1 -RootFolder $PSScriptRoot }
 
 Write-Host "Done."
-Write-Output "---------------------------------------"
\ No newline at end of file
+Write-Output "---------------------------------------"
+
+# Install nodes modules
+Write-Host "Installing node modules"
+Get-ChildItem $PSScriptRoot\src\ -rec |? { $_.FullName.EndsWith('DevToys.Blazor.csproj') } |% {
+    Write-Host "Installing node modules for $($_)..."
+    ExecSafe { & npm install $_.Directory  }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000000..decc6400df
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "devtoys": "file:src/app/dev/DevToys.Blazor"
+  }
+}
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 2811151a97..1217efed62 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -6,8 +6,8 @@
     <GirCore>0.5.0-preview.1</GirCore>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="CommunityToolkit.Common" Version="$(CommunityToolkitVersion)" />
-    <PackageVersion Include="CommunityToolkit.Diagnostics" Version="$(CommunityToolkitVersion)" />
+    <PackageVersion Include="CommunityToolkit.Common" Version="8.2.2" />
+    <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="$(CommunityToolkitVersion)" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <PackageVersion Include="FluentAssertions" Version="6.11.0" />
@@ -23,7 +23,7 @@
     <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(DotNetVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(DotNetVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(DotNetVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="$(DotNetVersion)" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.3.2" />
@@ -32,8 +32,8 @@
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NuGet.Packaging" Version="6.9.1" />
     <PackageVersion Include="Nuke.Common" Version="8.0.0" />
-    <PackageVersion Include="OneOf" Version="3.0.263" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.3" />
+    <PackageVersion Include="OneOf" Version="3.0.271" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.4" />
     <PackageVersion Include="System.Text.Json" Version="$(DotNetVersion)" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.ComponentModel.Composition" Version="$(DotNetVersion)" />
diff --git a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj
index ac05449f26..f12cbe19c5 100644
--- a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj
+++ b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj
@@ -5,9 +5,6 @@
     <RootNamespace>DevToys.Blazor</RootNamespace>
     <EnableDefaultCssItems>false</EnableDefaultCssItems>
     <TypeScriptTarget>ES6</TypeScriptTarget>
-
-    <!-- Only needed on Mac? -->
-    <PrepareForBuildDependsOn>CompileTypeScript;GetTypeScriptOutputForPublishing;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
   </PropertyGroup>
 
   <ItemGroup>

From fd456e2f440d93ee7da9a87bb32a54c70e27aa17 Mon Sep 17 00:00:00 2001
From: btiteux <titeux.benjamin@outlook.com>
Date: Sun, 26 May 2024 19:26:33 +0200
Subject: [PATCH 2/2] target MacOs Only

---
 src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj
index f12cbe19c5..ec35a980e2 100644
--- a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj
+++ b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj
@@ -7,6 +7,10 @@
     <TypeScriptTarget>ES6</TypeScriptTarget>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$(DefineConstants) == '__MACOS__'">
+    <PrepareForBuildDependsOn>CompileTypeScript;GetTypeScriptOutputForPublishing;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" />