Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 25 additions & 12 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,42 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
3.1.x
6.0.x
7.0.x
dotnet-version: 9.0.x
- name: Retore Workload
run: dotnet workload restore
- name: Restore dependencies
run: dotnet restore
- name: Set Assembly Version
run: ./build.sh --task=GitVersion --configuration=Release
- name: Prepare assembly version
id: version
run: |
VERSION=${{ github.event.release.name }}
echo "assembly=${VERSION%-*}.${{ github.run_number }}" >> "$GITHUB_OUTPUT"
- name: Update project version
uses: vers-one/dotnet-project-version-updater@v1.7
with:
file: "**/*.csproj"
version: ${{ github.event.release.name }}
- name: Update assembly version
uses: vers-one/dotnet-project-version-updater@v1.7
with:
file: "**/AssemblyInfo.cs"
version: ${{ steps.version.outputs.assembly }}
- name: Build Library
run: dotnet build ./Float.TinCan.ActivityLibrary/Float.TinCan.ActivityLibrary.csproj --configuration Release --no-restore
- name: Update Version
run: sed -i "s/<Version><\/Version>/<Version>${{ github.event.release.name }}<\/Version>/" ./Float.TinCan.ActivityLibrary/Float.TinCan.ActivityLibrary.csproj
- name: Pack and Upload
- name: Pack
run: dotnet pack --configuration Release --no-restore

- name: Archive artifact
uses: actions/upload-artifact@v4
with:
name: Float.TinCan.ActivityLibrary.${{ github.event.release.name }}.nupkg
path: ./Float.TinCan.ActivityLibrary/bin/Release/Float.TinCan.ActivityLibrary.${{ github.event.release.name }}.nupkg
if-no-files-found: error
- name: Deploy to NuGet
env:
FLOAT_NUGET_TOKEN: ${{ secrets.FLOAT_NUGET_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
3.1.x
7.0.x
8.0.x
9.0.x
- name: Retore Workload
run: dotnet workload restore
- name: Restore dependencies
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net7.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<LangVersion>9.0</LangVersion>
<UseMaui>true</UseMaui>
Expand All @@ -19,9 +19,15 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
<PackageReference Include="Microsoft.Maui.Controls" Version="[8.0.20,9)" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
<PackageReference Include="Microsoft.Maui.Controls" Version="[8.0.20,9)" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net9'))">
<PackageReference Include="Microsoft.Maui.Controls" Version="[9.0.0,10)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Float.TinCan.ActivityLibrary\Float.TinCan.ActivityLibrary.csproj" />
</ItemGroup>
Expand Down
12 changes: 9 additions & 3 deletions Float.TinCan.ActivityLibrary/Float.TinCan.ActivityLibrary.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2;net7.0;net8.0;</TargetFrameworks>
<TargetFrameworks>netstandard2;net7.0;net8.0;net9.0;</TargetFrameworks>
<AssemblyName>Float.TinCan.ActivityLibrary</AssemblyName>
<AssemblyAuthor>Float</AssemblyAuthor>
<AssemblyDescription>A library for starting xAPI activities.</AssemblyDescription>
Expand All @@ -12,7 +12,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>9.0</LangVersion>
<ReleaseVersion>1.0.0</ReleaseVersion>
<Version></Version>
<Version>0.0.1</Version>
<UseMaui>true</UseMaui>
</PropertyGroup>
<ItemGroup>
Expand All @@ -35,15 +35,21 @@
<PackageReference Include="Float.FileDownloader" Version="1.0.0.44" />
<PackageReference Include="Float.TinCan" Version="1.0.3.30" />
<PackageReference Include="Float.TinCan.LocalLRSServer" Version="2.1.0" />
<PackageReference Include="Float.Core" Version="2.0.0" />
<PackageReference Include="Float.Core" Version="[2.0.0,]" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
<PackageReference Include="Microsoft.Maui.Controls" Version="[8.0.20,9)" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
<PackageReference Include="Microsoft.Maui.Controls" Version="[8.0.20,9)" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net9'))">
<PackageReference Include="Microsoft.Maui.Controls" Version="[9.0.0,10)" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<PackageReference Include="Xamarin.Forms" Version="[5.0.0.1874,6)" />
</ItemGroup>
Expand Down
190 changes: 0 additions & 190 deletions build.cake

This file was deleted.

Loading