-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #134 from VaclavElias/update-15-cross-platform-imp…
…rovements Update 15 - Cross platform improvements
- Loading branch information
Showing
10 changed files
with
100 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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/[email protected] | ||
| 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 }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
src/Stride.CommunityToolkit.Windows/Stride.CommunityToolkit.Windows.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <RuntimeIdentifier>win-x64</RuntimeIdentifier> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="..\CommonSettings.props" /> | ||
|
|
||
| <ItemGroup> | ||
| <!-- The light requires a shader defined in the engine assemblies - but shaders are assets and I think they are compiled by the asset compiler per Graphics API target, that's why we need Stride.Core.Assets.CompilerApp --> | ||
| <PackageReference Include="Stride.Core.Assets.CompilerApp" Version="4.2.0.2122" IncludeAssets="build;buildTransitive" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Stride.CommunityToolkit\Stride.CommunityToolkit.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters