Skip to content

Commit

Permalink
Update prerequisites, website and workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
CatmanFan committed Jan 9, 2025
1 parent 7a1d7f2 commit 31f05c9
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 59 deletions.
Binary file modified .github/workflows/dotnet.yml
Binary file not shown.
10 changes: 9 additions & 1 deletion .github/workflows/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ on:
branches: [ "main" ]
paths:
- docs/**
- .github/workflows/mkdocs.yml
pull_request:
branches: [ "main" ]
paths:
- docs/**
- .github/workflows/mkdocs.yml

permissions:
contents: write
Expand All @@ -23,11 +25,15 @@ jobs:
run: |
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
- name: Setup Python 3.x
- uses: actions/setup-python@v5
with:
python-version: 3.x

- name: Setup C++
uses: aminya/setup-cpp@v0.44.0

- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV

- uses: actions/cache@v4
Expand All @@ -40,7 +46,9 @@ jobs:
- name: Install dependencies
run: |
pip install mkdocs-material
pip install mkdocs-bootstrap
pip install mkdocs-static-i18n
pip install mkdocs-mdpo-plugin
- name: Deploy GitHub Pages website
run: mkdocs gh-deploy --force
Expand Down
30 changes: 15 additions & 15 deletions FriishProduce/App.config
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="libraries;libs;resources\libraries;resources\libs;lib;resources\lib" />
<probing privatePath="libraries;libs;resources\libraries;resources\libs;lib;resources\lib"/>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.HashCode" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<assemblyIdentity name="Microsoft.Bcl.HashCode" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>
17 changes: 1 addition & 16 deletions FriishProduce/FriishProduce.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>FriishProduce</RootNamespace>
<AssemblyName>FriishProduce</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -673,26 +673,11 @@
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Visual.C++.14.0.x64">
<Visible>False</Visible>
<ProductName>Visual C++ "14" Runtime Libraries %28x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Visual.C++.14.0.x86">
<Visible>False</Visible>
<ProductName>Visual C++ "14" Runtime Libraries %28x86%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
Expand Down
4 changes: 1 addition & 3 deletions docs/docs/fr/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ La configuration suivante est nécessaire pour exécuter le programme :
* **Système d'exploitation :** Windows 7 ou version ultérieure
* **Redistribuables :**
* .NET Framework 2.0 (nécessaire pour libWiiSharp)
* .NET Framework 3.5 SP1
* .NET Framework 4.8
* .NET Framework 4.7.2 (nécessaire pour ccf-tools)
* .NET Framework 4.7.2
* Redistribuable Microsoft Visual C++ pour Visual Studio 2019 (nécessaire pour ccf-tools)

!!! warning "Attention"
Expand Down
4 changes: 1 addition & 3 deletions docs/docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ The following minimum requirements are needed in order to run the program:
* **OS:** Windows 7 or later
* **Redistributables:**
* .NET Framework 2.0 (needed for libWiiSharp)
* .NET Framework 3.5 SP1
* .NET Framework 4.8
* .NET Framework 4.7.2 (needed for ccf-tools)
* .NET Framework 4.7.2
* Microsoft Visual C++ Redistributable for Visual Studio 2019 (needed for ccf-tools)

!!! warning
Expand Down
43 changes: 22 additions & 21 deletions docs/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,31 @@ nav:
- About: about.md

theme:
# Material theme settings
# Bootstrap theme settings
# ---------------------------------------------
name: material
palette:
# Palette toggle for light mode
- scheme: default
primary: white
accent: blue
toggle:
icon: material/brightness-7
name: Switch to dark mode
name: bootstrap
logo: img/logo.png

# Palette toggle for dark mode
- scheme: slate
primary: black
accent: light blue
toggle:
icon: material/brightness-4
name: Switch to light mode
# Material theme settings
# ---------------------------------------------
# name: material
# logo: img/logo.png
# palette:
# # Palette toggle for light mode
# - scheme: default
# primary: white
# accent: blue
# toggle:
# icon: material/brightness-7
# name: Switch to dark mode

logo: docs/img/logo.png
# # Palette toggle for dark mode
# - scheme: slate
# primary: black
# accent: light blue
# toggle:
# icon: material/brightness-4
# name: Switch to light mode

extra_css:
- assets/extra.css
Expand All @@ -41,20 +45,17 @@ plugins:
fallback_to_default: true
languages:
- locale: en
name: English
build: true
default: true

- locale: fr
name: Français
build: true
nav_translations:
Home: Accueil
Tutorial: Tutoriel
About: À propos

- locale: ja
name: 日本語
build: true
nav_translations:
Home: ホームページ
Expand Down

0 comments on commit 31f05c9

Please sign in to comment.