diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 947960cb..c0fa8186 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,6 +21,8 @@ env:
ENABLE_DIAGNOSTICS: false
#COREHOST_TRACE: 1
COREHOST_TRACEFILE: corehosttrace.log
+ MULTI_TARGET_DIRECTORY: tooling/MultiTarget
+ HEADS_DIRECTORY: tooling/ProjectHeads
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
@@ -60,7 +62,6 @@ jobs:
platform: [WinUI2, WinUI3]
env:
- MULTI_TARGET_DIRECTORY: tooling/MultiTarget
# faux-ternary expression to select which platforms to build for each platform vs. duplicating step below.
TARGET_PLATFORMS: ${{ matrix.platform != 'WinUI3' && 'all' || 'all-uwp' }}
TEST_PLATFORM: ${{ matrix.platform != 'WinUI3' && 'UWP' || 'WinAppSdk' }}
@@ -153,8 +154,6 @@ jobs:
wasm-linux:
runs-on: ubuntu-latest
- env:
- HEADS_DIRECTORY: tooling/ProjectHeads
steps:
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
@@ -176,6 +175,11 @@ jobs:
- name: Restore dotnet tools
run: dotnet tool restore
+ - name: Enable WASM TargetFrameworks
+ shell: pwsh
+ working-directory: ./${{ env.MULTI_TARGET_DIRECTORY }}
+ run: ./UseTargetFrameworks.ps1 wasm
+
- name: Generate solution
shell: pwsh
working-directory: ./
@@ -188,7 +192,7 @@ jobs:
# See launch.json configuration file for analogous command we're emulating here to build LINK: ../../.vscode/launch.json:CommunityToolkit.App.Wasm.csproj
- name: dotnet build
working-directory: ./${{ env.HEADS_DIRECTORY }}/AllComponents/Wasm/
- run: dotnet build /r /bl /p:UnoSourceGeneratorUseGenerationHost=true /p:UnoSourceGeneratorUseGenerationController=false
+ run: dotnet build /r /bl
# TODO: Do we want to run tests here? Can we do that on linux easily?
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 421e0cd0..3577abd4 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,8 +11,6 @@
"build",
"/r",
"/bl",
- "/p:UnoSourceGeneratorUseGenerationHost=true",
- "/p:UnoSourceGeneratorUseGenerationController=false",
"/p:UnoRemoteControlPort=443",
"--project=${workspaceFolder}/tooling/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj"
],
diff --git a/Directory.Build.props b/Directory.Build.props
index f9e19e81..611517b2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,6 +9,9 @@
$(RepositoryDirectory)\tooling
true
$(RepositoryDirectory)\components\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj
+ $(RepositoryDirectory)\components\Converters\src\CommunityToolkit.WinUI.Converters.csproj
+
+
$(RepositoryDirectory)\components\Helpers\src\CommunityToolkit.WinUI.Helpers.csproj
$(RepositoryDirectory)\components\Behaviors\src\CommunityToolkit.WinUI.Behaviors.csproj
$(RepositoryDirectory)\components\Animations\src\CommunityToolkit.WinUI.Animations.csproj
diff --git a/tooling b/tooling
index bc519fe2..14fbcce4 160000
--- a/tooling
+++ b/tooling
@@ -1 +1 @@
-Subproject commit bc519fe2e008037ac9c844be452d84356dcce213
+Subproject commit 14fbcce41370109f363bcda3de97d472a4340769