diff --git a/.github/workflows/dotnet-nuget.yml b/.github/workflows/dotnet-nuget.yml index ebecf17a..aba61e5b 100644 --- a/.github/workflows/dotnet-nuget.yml +++ b/.github/workflows/dotnet-nuget.yml @@ -2,7 +2,8 @@ name: .NET Build and Publish Nuget env: PROJECT_PATH_CORE: src/Stride.CommunityToolkit/Stride.CommunityToolkit.csproj - PROJECT_PATH_SKYBOX: src\Stride.CommunityToolkit.Skyboxes\Stride.CommunityToolkit.Skyboxes.csproj + PROJECT_PATH_SKYBOX: src/Stride.CommunityToolkit.Skyboxes/Stride.CommunityToolkit.Skyboxes.csproj + PROJECT_PATH_WINDOWS: src/Stride.CommunityToolkit.Windows/Stride.CommunityToolkit.Windows.csproj COMMON_SETTINGS_PATH: src/CommonSettings.props VERSION: "1.0.0.0-preview.${{ github.run_number }}" @@ -33,26 +34,26 @@ jobs: run: dotnet restore ${{ env.PROJECT_PATH_CORE }} # Temporary solution, because of System.Security.Cryptography.Pkcs not found issue - - name: Modify Stride.Core.Assets.CompilerApp.targets - shell: pwsh - run: | - $targetsPath = Join-Path -Path (Get-ChildItem -Path "${env:USERPROFILE}\.nuget\packages\stride.core.assets.compilerapp\4.2.0.2122\buildTransitive" -Filter "Stride.Core.Assets.CompilerApp.targets" -Recurse).DirectoryName -ChildPath "Stride.Core.Assets.CompilerApp.targets" - - [xml]$targetsXml = Get-Content -Path $targetsPath - $namespaceManager = New-Object System.Xml.XmlNamespaceManager($targetsXml.NameTable) - $namespaceManager.AddNamespace("msbuild", "http://schemas.microsoft.com/developer/msbuild/2003") - - $targetNode = $targetsXml.SelectSingleNode("//msbuild:Target[@Name='_StridePrepareAssetsForPack']", $namespaceManager) - if ($targetNode -ne $null) - { - $targetNode.SetAttribute("Condition", "false") - $targetsXml.Save($targetsPath) - Write-Host "Modified _StridePrepareAssetsForPack target in Stride.Core.Assets.CompilerApp.targets" - } - else - { - Write-Host "_StridePrepareAssetsForPack target not found in Stride.Core.Assets.CompilerApp.targets" - } + # - name: Modify Stride.Core.Assets.CompilerApp.targets + # shell: pwsh + # run: | + # $targetsPath = Join-Path -Path (Get-ChildItem -Path "${env:USERPROFILE}\.nuget\packages\stride.core.assets.compilerapp\4.2.0.2122\buildTransitive" -Filter "Stride.Core.Assets.CompilerApp.targets" -Recurse).DirectoryName -ChildPath "Stride.Core.Assets.CompilerApp.targets" + + # [xml]$targetsXml = Get-Content -Path $targetsPath + # $namespaceManager = New-Object System.Xml.XmlNamespaceManager($targetsXml.NameTable) + # $namespaceManager.AddNamespace("msbuild", "http://schemas.microsoft.com/developer/msbuild/2003") + + # $targetNode = $targetsXml.SelectSingleNode("//msbuild:Target[@Name='_StridePrepareAssetsForPack']", $namespaceManager) + # if ($targetNode -ne $null) + # { + # $targetNode.SetAttribute("Condition", "false") + # $targetsXml.Save($targetsPath) + # Write-Host "Modified _StridePrepareAssetsForPack target in Stride.Core.Assets.CompilerApp.targets" + # } + # else + # { + # Write-Host "_StridePrepareAssetsForPack target not found in Stride.Core.Assets.CompilerApp.targets" + # } - name: Build run: dotnet build ${{ env.PROJECT_PATH_CORE }} --no-restore @@ -70,6 +71,24 @@ jobs: VERSION_FILE_PATH: ${{ env.COMMON_SETTINGS_PATH }} NUGET_KEY: ${{secrets.NUGET_API_KEY}} + # Stride.CommunityToolkit.Windows + - name: Restore dependencies - Stride.CommunityToolkit.Windows + run: dotnet restore ${{ env.PROJECT_PATH_WINDOWS }} + + - name: Build + run: dotnet build ${{ env.PROJECT_PATH_WINDOWS }} --no-restore + + - name: Test + run: dotnet test ${{ env.PROJECT_PATH_WINDOWS }} --no-build --verbosity normal + + - name: Publish Stride Community Toolkit - Windows + uses: alirezanet/publish-nuget@v3.1.0 + with: + PROJECT_FILE_PATH: ${{ env.PROJECT_PATH_WINDOWS }} + VERSION_FILE_PATH: ${{ env.COMMON_SETTINGS_PATH }} + NUGET_KEY: ${{secrets.NUGET_API_KEY}} + TAG_COMMIT: false + # Stride.CommunityToolkit.Skyboxes - name: Restore dependencies - Stride.CommunityToolkit.Skyboxes run: dotnet restore ${{ env.PROJECT_PATH_SKYBOX }} diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 5ae5100e..bc451af6 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,8 +1,9 @@ name: .NET Build Test env: - PROJECT_PATH_CORE: src\Stride.CommunityToolkit\Stride.CommunityToolkit.csproj - PROJECT_PATH_SKYBOX: src\Stride.CommunityToolkit.Skyboxes\Stride.CommunityToolkit.Skyboxes.csproj + PROJECT_PATH_CORE: src/Stride.CommunityToolkit/Stride.CommunityToolkit.csproj + PROJECT_PATH_SKYBOX: src/Stride.CommunityToolkit.Skyboxes/Stride.CommunityToolkit.Skyboxes.csproj + PROJECT_PATH_WINDOWS: src/Stride.CommunityToolkit.Windows/Stride.CommunityToolkit.Windows.csproj on: workflow_dispatch: @@ -25,26 +26,26 @@ jobs: run: dotnet restore ${{ env.PROJECT_PATH_CORE }} # Temporary solution, because of System.Security.Cryptography.Pkcs not found issue - - name: Modify Stride.Core.Assets.CompilerApp.targets - shell: pwsh - run: | - $targetsPath = Join-Path -Path (Get-ChildItem -Path "${env:USERPROFILE}\.nuget\packages\stride.core.assets.compilerapp\4.2.0.2122\buildTransitive" -Filter "Stride.Core.Assets.CompilerApp.targets" -Recurse).DirectoryName -ChildPath "Stride.Core.Assets.CompilerApp.targets" - - [xml]$targetsXml = Get-Content -Path $targetsPath - $namespaceManager = New-Object System.Xml.XmlNamespaceManager($targetsXml.NameTable) - $namespaceManager.AddNamespace("msbuild", "http://schemas.microsoft.com/developer/msbuild/2003") - - $targetNode = $targetsXml.SelectSingleNode("//msbuild:Target[@Name='_StridePrepareAssetsForPack']", $namespaceManager) - if ($targetNode -ne $null) - { - $targetNode.SetAttribute("Condition", "false") - $targetsXml.Save($targetsPath) - Write-Host "Modified _StridePrepareAssetsForPack target in Stride.Core.Assets.CompilerApp.targets" - } - else - { - Write-Host "_StridePrepareAssetsForPack target not found in Stride.Core.Assets.CompilerApp.targets" - } + # - name: Modify Stride.Core.Assets.CompilerApp.targets + # shell: pwsh + # run: | + # $targetsPath = Join-Path -Path (Get-ChildItem -Path "${env:USERPROFILE}\.nuget\packages\stride.core.assets.compilerapp\4.2.0.2122\buildTransitive" -Filter "Stride.Core.Assets.CompilerApp.targets" -Recurse).DirectoryName -ChildPath "Stride.Core.Assets.CompilerApp.targets" + + # [xml]$targetsXml = Get-Content -Path $targetsPath + # $namespaceManager = New-Object System.Xml.XmlNamespaceManager($targetsXml.NameTable) + # $namespaceManager.AddNamespace("msbuild", "http://schemas.microsoft.com/developer/msbuild/2003") + + # $targetNode = $targetsXml.SelectSingleNode("//msbuild:Target[@Name='_StridePrepareAssetsForPack']", $namespaceManager) + # if ($targetNode -ne $null) + # { + # $targetNode.SetAttribute("Condition", "false") + # $targetsXml.Save($targetsPath) + # Write-Host "Modified _StridePrepareAssetsForPack target in Stride.Core.Assets.CompilerApp.targets" + # } + # else + # { + # Write-Host "_StridePrepareAssetsForPack target not found in Stride.Core.Assets.CompilerApp.targets" + # } # - name: Get NuGet global-packages location # id: nuget-cache @@ -67,6 +68,13 @@ jobs: # Copy-Item "C:\Users\runneradmin\.nuget\packages\system.security.cryptography.pkcs\6.0.4\lib\net6.0\System.Security.Cryptography.Pkcs.dll" -Destination "src/Stride.CommunityToolkit/bin/Debug/net8.0/" # shell: pwsh + # Stride.CommunityToolkit.Windows + - name: Restore Stride.CommunityToolkit.Windows dependencies + run: dotnet restore ${{ env.PROJECT_PATH_WINDOWS }} + + - name: Build Stride.CommunityToolkit.Windows + run: dotnet build ${{ env.PROJECT_PATH_WINDOWS }} --no-restore + # Stride.CommunityToolkit.Skyboxes - name: Restore Stride.CommunityToolkit.Skyboxes dependencies run: dotnet restore ${{ env.PROJECT_PATH_SKYBOX }} diff --git a/Stride.CommunityToolkit.sln b/Stride.CommunityToolkit.sln index 4afa3b31..b7fab772 100644 --- a/Stride.CommunityToolkit.sln +++ b/Stride.CommunityToolkit.sln @@ -54,6 +54,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.Common", "examples\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.CommunityToolkit.Skyboxes", "src\Stride.CommunityToolkit.Skyboxes\Stride.CommunityToolkit.Skyboxes.csproj", "{423A1266-4A6D-425F-96CE-945A1802F711}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stride.CommunityToolkit.Windows", "src\Stride.CommunityToolkit.Windows\Stride.CommunityToolkit.Windows.csproj", "{E5E01EDB-524C-4FC2-951B-321E5D08C972}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -135,6 +137,10 @@ Global {423A1266-4A6D-425F-96CE-945A1802F711}.Debug|Any CPU.Build.0 = Debug|Any CPU {423A1266-4A6D-425F-96CE-945A1802F711}.Release|Any CPU.ActiveCfg = Release|Any CPU {423A1266-4A6D-425F-96CE-945A1802F711}.Release|Any CPU.Build.0 = Release|Any CPU + {E5E01EDB-524C-4FC2-951B-321E5D08C972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5E01EDB-524C-4FC2-951B-321E5D08C972}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5E01EDB-524C-4FC2-951B-321E5D08C972}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5E01EDB-524C-4FC2-951B-321E5D08C972}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/docs/docfx.json b/docs/docfx.json index 52be887f..f1f7dad6 100644 --- a/docs/docfx.json +++ b/docs/docfx.json @@ -5,7 +5,8 @@ { "files": [ "Stride.CommunityToolkit/Stride.CommunityToolkit.csproj", - "Stride.CommunityToolkit.Skyboxes/Stride.CommunityToolkit.Skyboxes.csproj" + "Stride.CommunityToolkit.Skyboxes/Stride.CommunityToolkit.Skyboxes.csproj", + "Stride.CommunityToolkit.Windows/Stride.CommunityToolkit.Windows.csproj" ], "src": "../src", "properties": { @@ -35,7 +36,7 @@ "_appTitle": "Stride Community Toolkit", "_enableSearch": true, "_appLogoPath": "media/stride-logo-blue-toolkit.svg", - "_appFooter": "

Supported by the .NET Foundation

Made with docfx

Stride Community Toolkit Website v.1.0.0.0

© .NET Foundation and Contributors

" + "_appFooter": "

Supported by the .NET Foundation

Made with docfx

Stride Community Toolkit Website v.1.0.0.1

© .NET Foundation and Contributors

" }, "fileMetadata": { "_appTitle": { diff --git a/examples/code-only/Example01_Basic2DScene/Example01_Basic2DScene.csproj b/examples/code-only/Example01_Basic2DScene/Example01_Basic2DScene.csproj index a717cb2e..fb7cf280 100644 --- a/examples/code-only/Example01_Basic2DScene/Example01_Basic2DScene.csproj +++ b/examples/code-only/Example01_Basic2DScene/Example01_Basic2DScene.csproj @@ -16,7 +16,7 @@ - + diff --git a/examples/code-only/Example01_Basic3DScene/Example01_Basic3DScene.csproj b/examples/code-only/Example01_Basic3DScene/Example01_Basic3DScene.csproj index 7ce10973..6468e358 100644 --- a/examples/code-only/Example01_Basic3DScene/Example01_Basic3DScene.csproj +++ b/examples/code-only/Example01_Basic3DScene/Example01_Basic3DScene.csproj @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/src/CommonSettings.props b/src/CommonSettings.props index 68e834c6..97a9f24a 100644 --- a/src/CommonSettings.props +++ b/src/CommonSettings.props @@ -13,7 +13,7 @@ Stride Contributors README.md - True + diff --git a/src/Stride.CommunityToolkit.Skyboxes/Stride.CommunityToolkit.Skyboxes.csproj b/src/Stride.CommunityToolkit.Skyboxes/Stride.CommunityToolkit.Skyboxes.csproj index 67231c49..cb2be684 100644 --- a/src/Stride.CommunityToolkit.Skyboxes/Stride.CommunityToolkit.Skyboxes.csproj +++ b/src/Stride.CommunityToolkit.Skyboxes/Stride.CommunityToolkit.Skyboxes.csproj @@ -9,17 +9,9 @@ - - - - - $(DefineConstants)TRACE;CODE_ANALYSIS - - diff --git a/src/Stride.CommunityToolkit.Windows/Stride.CommunityToolkit.Windows.csproj b/src/Stride.CommunityToolkit.Windows/Stride.CommunityToolkit.Windows.csproj new file mode 100644 index 00000000..7d13a22d --- /dev/null +++ b/src/Stride.CommunityToolkit.Windows/Stride.CommunityToolkit.Windows.csproj @@ -0,0 +1,18 @@ + + + + win-x64 + + + + + + + + + + + + + + diff --git a/src/Stride.CommunityToolkit/Stride.CommunityToolkit.csproj b/src/Stride.CommunityToolkit/Stride.CommunityToolkit.csproj index 09ccde75..e3ec89b5 100644 --- a/src/Stride.CommunityToolkit/Stride.CommunityToolkit.csproj +++ b/src/Stride.CommunityToolkit/Stride.CommunityToolkit.csproj @@ -14,18 +14,11 @@ - - -