Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump versions on the templates #335

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Bump versions on the templates #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d35799e
bump templates to v1
AngelMunoz Jul 24, 2023
4648ef4
add template build script to CI
AngelMunoz Jul 24, 2023
0bac2a0
remove force failures
AngelMunoz Jul 24, 2023
31fa666
add missing popd
AngelMunoz Jul 24, 2023
72f33e0
try to fix permission denied failure
AngelMunoz Jul 24, 2023
56840e6
another attempt
AngelMunoz Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:

- name: Build & Test
run: dotnet test src/Avalonia.FuncUI.sln --verbosity normal

- name: Build Templates
run: pushd ./src/Avalonia.FuncUI.Templates && chmod +x ./test-templates.ps1 && pwsh ./test-templates.ps1 && popd

- name: Build for release
run: dotnet build src/Avalonia.FuncUI/Avalonia.FuncUI.fsproj -c Release
Expand All @@ -36,3 +39,4 @@ jobs:

- name: Publish base project and Elmish NuGets (if this version was not published before)
run: dotnet nuget push src/**/bin/Release/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate

4 changes: 4 additions & 0 deletions .github/workflows/pull-requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ jobs:
run: dotnet restore src/Avalonia.FuncUI.sln
- name: Build
run: dotnet build src/Avalonia.FuncUI.sln --no-restore

- name: Test
run: dotnet test src/Avalonia.FuncUI.sln --no-build --verbosity normal

- name: Build Templates
run: pushd ./src/Avalonia.FuncUI.Templates && chmod +x ./test-templates.ps1 && pwsh ./test-templates.ps1 && popd


2 changes: 1 addition & 1 deletion src/Avalonia.FuncUI.Templates/Avalonia.FuncUI.Templates.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageType>Template</PackageType>
<PackageVersion>1.0.0-rc1.1.0</PackageVersion>
<PackageVersion>1.0.0</PackageVersion>
<PackageId>Avalonia.FuncUI.Templates</PackageId>
<Title>Avalonia.FuncUI Templates</Title>
<Authors>Josua Jäger, Kevin Schneider, Angel Daniel Munoz Gonzalez</Authors>
Expand Down
12 changes: 6 additions & 6 deletions src/Avalonia.FuncUI.Templates/content/BasicMvuTemplate/BasicMvuTemplate.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<ItemGroup />

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.FuncUI" Version="1.0.0-rc1.1.0" />
<PackageReference Include="Avalonia.FuncUI.Elmish" Version="1.0.0-rc1.1.0" />
<PackageReference Include="Avalonia" Version="11.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
<PackageReference Include="Avalonia.FuncUI" Version="1.0.0.0" />
<PackageReference Include="Avalonia.FuncUI.Elmish" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/Avalonia.FuncUI.Templates/content/BasicTemplate/BasicTemplate.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.FuncUI" Version="1.0.0-rc1.1.0" />
<PackageReference Include="Avalonia" Version="11.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
<PackageReference Include="Avalonia.FuncUI" Version="1.0.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Avalonia.FuncUI.Templates/content/CrossPlatformMvuTemplate/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ApplicationTitle>AvaTitleParameter</ApplicationTitle>
<!-- #endif -->
<!-- Avalonia versions -->
<AvaloniaVersion>11.0.0-rc1.1</AvaloniaVersion>
<AvaloniaFuncUIVersion>1.0.0-rc1.1.0</AvaloniaFuncUIVersion>
<AvaloniaVersion>11.0.0</AvaloniaVersion>
<AvaloniaFuncUIVersion>1.0.0</AvaloniaFuncUIVersion>
</PropertyGroup>
</Project>
12 changes: 6 additions & 6 deletions src/Avalonia.FuncUI.Templates/content/FullMvuTemplate/FullMvuTemplate.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.FuncUI" Version="1.0.0-rc1.1.0" />
<PackageReference Include="Avalonia.FuncUI.Elmish" Version="1.0.0-rc1.1.0" />
<PackageReference Include="Avalonia" Version="11.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
<PackageReference Include="Avalonia.FuncUI" Version="1.0.0.0" />
<PackageReference Include="Avalonia.FuncUI.Elmish" Version="1.0.0" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions src/Avalonia.FuncUI.Templates/content/FullTemplate/FullTemplate.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.FuncUI" Version="1.0.0-rc1.1.0" />
<PackageReference Include="Avalonia" Version="11.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
<PackageReference Include="Avalonia.FuncUI" Version="1.0.0" />
</ItemGroup>
</Project>
24 changes: 24 additions & 0 deletions src/Avalonia.FuncUI.Templates/test-templates.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

$templates = Get-ChildItem ./content -Directory -Exclude "CrossPlatformMvuTemplate"

$errors = [System.Collections.Generic.List[PSObject]]::new()

foreach ($templateDir in $templates) {
<# $templateDir is the current item #>
Push-Location $templateDir.FullName;
Write-Host "Building template: $($templateDir.Name)";
dotnet build -c release

if ($LASTEXITCODE -ne 0) {
$errors.Add($templateDir);
}
Pop-Location;
}

if ($errors.Count -gt 0) {
Write-Error -Message "The following templates failed to build:"
$errors | Format-Table -Property Name;
exit 1;
}

Write-Host "All templates built successfully."