diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f072036..e4107dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,44 +9,36 @@ on: default: 'warning' push: - branches: [ master, dev, preview ] + branches: + - master + - dev + - preview + - v* paths: - "src/**" - ".github/workflows/**" -env: - ShinyVersion: 2.0.0 - DotNetVersion: 6.0.100 - jobs: build: runs-on: windows-latest steps: - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 - - - uses: actions/checkout@v2 - - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + - name: Checkout + uses: actions/checkout@v2 with: - dotnet-version: ${{ env.DotNetVersion }} + fetch-depth: 0 - - name: Generate Build Number - id: buildnumber - uses: einaregilsson/build-number@v3 + - name: Setup .NET 8.0 + uses: actions/setup-dotnet@v3 with: - token: ${{secrets.github_token}} + dotnet-version: 8.0.x - - name: Build Preview - if: ${{ github.ref == 'refs/heads/preview' }} - run: msbuild Build.slnf /restore -m -property:Configuration=Release -property:ShinyVersion=${{env.ShinyVersion}}.${{steps.buildnumber.outputs.build_number}}-preview + - name: Add .NET Workloads + run: dotnet workload install maui - - name: Build Release - if: ${{ github.ref != 'refs/heads/preview' }} - run: msbuild Build.slnf /restore -m -property:Configuration=Release -property:ShinyVersion=${{env.ShinyVersion}}.${{steps.buildnumber.outputs.build_number}} + - name: Build + run: dotnet build Build.slnf /restore -m -property:Configuration=Release -property:PublicRelease=true - name: Post NuGet Artifacts uses: actions/upload-artifact@v2 @@ -55,5 +47,5 @@ jobs: path: '**/*.nupkg' - name: Publish NuGets - if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/preview' }} + if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/v') }} run: dotnet nuget push **\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGETAPIKEY }} --skip-duplicate \ No newline at end of file diff --git a/Build.slnf b/Build.slnf index 3e8c98c..50b6332 100644 --- a/Build.slnf +++ b/Build.slnf @@ -2,8 +2,6 @@ "solution": { "path": "Shiny.Framework.sln", "projects": [ - "src\\Shiny.Extensions.Dialogs.XfMaterial\\Shiny.Extensions.Dialogs.XfMaterial.csproj", - "src\\Shiny.Extensions.Dialogs\\Shiny.Extensions.Dialogs.csproj", "src\\Shiny.Framework\\Shiny.Framework.csproj" ] } diff --git a/Sample/App.xaml b/Sample/App.xaml new file mode 100644 index 0000000..eced074 --- /dev/null +++ b/Sample/App.xaml @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/Sample/App.xaml.cs b/Sample/App.xaml.cs new file mode 100644 index 0000000..7445c4d --- /dev/null +++ b/Sample/App.xaml.cs @@ -0,0 +1,10 @@ +namespace Sample; + +public partial class App : Application +{ + public App() + { + this.InitializeComponent(); + } +} + diff --git a/Sample/DialogsPage.xaml b/Sample/DialogsPage.xaml new file mode 100644 index 0000000..e7991b8 --- /dev/null +++ b/Sample/DialogsPage.xaml @@ -0,0 +1,26 @@ + + + + + +