From fd16bd9b35c50c3571891a63b9e097de5d781841 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Wed, 19 Jul 2023 07:52:28 -0700 Subject: [PATCH 1/4] Add Converters property to directory props to build converters from source for sample app --- Directory.Build.props | 3 +++ 1 file changed, 3 insertions(+) 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 From d3374456f3e20c193215704d36a662c2746e3e08 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:04:37 -0700 Subject: [PATCH 2/4] Update build to try only building for wasm in linux job --- .github/workflows/build.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 947960cb..be0b4bdc 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: ./ From 79aa9678ed44defb215db1a1d78f2d15b1cc07fa Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Tue, 1 Aug 2023 16:05:50 -0700 Subject: [PATCH 3/4] Updating tooling submodule Update tooling submodule pointer to `main` --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index bc519fe2..14fbcce4 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit bc519fe2e008037ac9c844be452d84356dcce213 +Subproject commit 14fbcce41370109f363bcda3de97d472a4340769 From 6a4ae3e8778efcc45651ac2139a07a1b54273dbd Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Wed, 2 Aug 2023 07:37:37 -0700 Subject: [PATCH 4/4] Remove unneeded build flags --- .github/workflows/build.yml | 2 +- .vscode/launch.json | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be0b4bdc..c0fa8186 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -192,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" ],