From 83fcd6a761bef26f246c42f4fc4147fc47645e39 Mon Sep 17 00:00:00 2001 From: Jan Pluskal Date: Mon, 26 Jan 2026 07:36:37 +0100 Subject: [PATCH 1/2] feat(L00): basic 2026 update --- Project/README.md | 3 +++ README.md | 60 ++++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/Project/README.md b/Project/README.md index 92ba392..4c6855f 100644 --- a/Project/README.md +++ b/Project/README.md @@ -1,3 +1,6 @@ +> :warning: **Varování** +> Zadání je z minulého roku, finální podoba bude zveřejněna po druhém týdnu semestru. + # ICS projekt ## Důležité upozornění diff --git a/README.md b/README.md index 2f1366b..9310cb4 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,14 @@ enableTitleFooter: true ## Přednášky -| Typ | Místnost | Čas | -| --------- | -------------------- | -------------- | -| Přednáška | **E112**, E104, E105 | St 08:00-09:50 | - -E104 a E105 bude otevřeno pouze v případě naplnění E112. +| Typ | Místnost | Čas | +| --------- | --------- | -------------- | +| Přednáška | **D0206** | St 08:00-09:50 | +++ ## Cvičení -Cvičení jsou demonstrační. Pokud možno, přineste si vlastní zařízení, na kterém budete moct cvičení aktivně zúčastnit. Bude potřeba vývojové prostředí ideálně Visual Studio 2022 / Rider / VSCode. +Cvičení jsou demonstrační. Pokud možno, přineste si vlastní zařízení, na kterém budete moct cvičení aktivně zúčastnit. Bude potřeba vývojové prostředí ideálně Visual Studio 2026 / Rider / VSCode. | Typ | Místnost | Čas | | ------------------------------- | --------- | -------------- | @@ -46,27 +44,27 @@ Cvičení jsou demonstrační. Pokud možno, přineste si vlastní zařízení, | Datum | Typ | Vyučující | Téma přednášky | | ------ | --- | --------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| 12.02. | L01 | Jan Pluskal | [Úvod do jazyka C# a platformy .NET](https://nesfit.github.io/ICS/Lectures/Lecture_01/_site/) - základní syntaxe jazyka ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_01/_site/?print-pdf)) | -| | E01 | Jan Pluskal | Práce s Visual Studio 2022, debugování a Azure DevOps založení projektu (základy pro zracování projektu) | -| 19.02. | L02 | Jan Pluskal | [Úvod do Objektově Orientovaného Programování](https://nesfit.github.io/ICS/Lectures/Lecture_02/_site/) ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_02/_site/?print-pdf)) | +| 11.02. | L01 | Jan Pluskal | [Úvod do jazyka C# a platformy .NET](https://nesfit.github.io/ICS/Lectures/Lecture_01/_site/) - základní syntaxe jazyka ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_01/_site/?print-pdf)) | +| | E01 | Jan Pluskal | Práce s Visual Studio 2026, debugování a Azure DevOps založení projektu (základy pro zracování projektu) | +| 18.02. | L02 | Jan Pluskal | [Úvod do Objektově Orientovaného Programování](https://nesfit.github.io/ICS/Lectures/Lecture_02/_site/) ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_02/_site/?print-pdf)) | | | E02 | Jan Pluskal | Objektově orientované programování a úvod do Entity Framework | -| 26.02. | L03 | Tibor Jašek | [Představení základních knihovních funkcí (BCL)](https://nesfit.github.io/ICS/Lectures/Lecture_03/_site/) - dotazování za pomocí vestavěného nástroje LINQ nad datovými zdroji (kolekcemi, XML, MSSQL) ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_03/_site/?print-pdf)) | -| 05.03. | L04 | Jan Pluskal | [Propojení aplikace s databází](https://nesfit.github.io/ICS/Lectures/Lecture_04/_site/) ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_04/_site/?print-pdf)) | +| 25.02. | L03 | Tibor Jašek | [Představení základních knihovních funkcí (BCL)](https://nesfit.github.io/ICS/Lectures/Lecture_03/_site/) - dotazování za pomocí vestavěného nástroje LINQ nad datovými zdroji (kolekcemi, XML, MSSQL) ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_03/_site/?print-pdf)) | +| 04.03. | L04 | Jan Pluskal | [Propojení aplikace s databází](https://nesfit.github.io/ICS/Lectures/Lecture_04/_site/) ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_04/_site/?print-pdf)) | | | E03 | Jan Pluskal | Entity framework | -| 09.03. | P01 | | **Odevzdání první fáze projektu** | -| 12.03. | L05 | Martin Dybal | Psaní čistého a udržovatelného kódu | -| 19.03. | L06 | Michal Tichý | Automatizované testování - práce s xUnit, CI | -| 26.03. | L07 | Michal Mrnuštík | Návrhový vzor Model-View-ViewModel | -| 02.04. | L08 | Roman Jašek | MAUI | +| 08.03. | P01 | | **Odevzdání první fáze projektu** | +| 11.03. | L05 | Martin Dybal | Psaní čistého a udržovatelného kódu | +| 18.03. | L06 | Michal Tichý | Automatizované testování - práce s xUnit, CI | +| 25.03. | L07 | Michal Mrnuštík | Návrhový vzor Model-View-ViewModel | +| 01.04. | L08 | Roman Jašek | MAUI | | | E04 | Roman Jašek | MAUI | -| 09.04. | L09 | Roman Jašek | MAUI | +| 08.04. | L09 | Roman Jašek | MAUI | | | E05 | Roman Jašek | MAUI | -| 13.04. | P02 | | **Odevzdání druhé fáze projektu** | -| 16.04. | L10 | Jan Pluskal | [Paralelní a asynchronní programování](https://nesfit.github.io/ICS/Lectures/Lecture_10/_site/) - proces, vlákno, úloha z pohledu C# a použitého .NET frameworku | -| 23.04. | L11 | Roman Jašek | Napojení aplikace na API server | +| 12.04. | P02 | | **Odevzdání druhé fáze projektu** | +| 15.04. | L10 | Jan Pluskal | [Paralelní a asynchronní programování](https://nesfit.github.io/ICS/Lectures/Lecture_10/_site/) - proces, vlákno, úloha z pohledu C# a použitého .NET frameworku | +| 22.04. | L11 | Roman Jašek | Napojení aplikace na API server | | | E06 | Jan Pluskal | Takto můžete napsat projekt?! | -| 30.05. | L12 | Jan Pluskal | [Multiplatformní programování](https://nesfit.github.io/ICS/Lectures/Lecture_13/_site/) - .NET Standard, .NET Core., .NET, kontejnerizace a deployment aplikací ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_10/_site/?print-pdf)) | -| 07.05. | L13 | Martin Dybal | Návrhové vzory - vytvářecí, strukturní a chování - Gang of Four (GoF) v kontextu C# | +| 29.05. | L12 | Jan Pluskal | [Multiplatformní programování](https://nesfit.github.io/ICS/Lectures/Lecture_13/_site/) - .NET Standard, .NET Core., .NET, kontejnerizace a deployment aplikací ([verze pro tisk](https://nesfit.github.io/ICS/Lectures/Lecture_10/_site/?print-pdf)) | +| 06.05. | L13 | Martin Dybal | Návrhové vzory - vytvářecí, strukturní a chování - Gang of Four (GoF) v kontextu C# | | Dle IS | P03 | | **Obhajoby projektu** | LXY - přednáška | EXY - democvičení | P0X - projekt @@ -92,8 +90,10 @@ LXY - přednáška | EXY - democvičení | P0X - projekt * Při obhajobě: * musí být přítomni všichni členové týmu (vyjímka je řádně omluvená nepřítomnost dle studijního řádu), + * v případě nutnosti můžou být někteří členové připojeni online, za online připojení, komunikaci a případné technické potíže nese odpovědnost tým samotný (minimálně jeden člen týmu musí být fyzicky přítomný a řešit připojení), * obhajovat projekt bude náhodně vybraný člen týmu, * nemusíte chodit v obleku... + * Očekává se prezentace Vaší aplikaci, tj. její funkčnost dle zadání a následuje technická rozprava nad zdrojovým kódem a otázky. --- @@ -101,8 +101,9 @@ LXY - přednáška | EXY - democvičení | P0X - projekt | Nástroj | Typ | Popis | | -------------------------------------------------------------------------------------------------- | ------------------ | --------------------------------------------------------------------------------------------------------------------------------- | -| [Visual Studio 2022](https://aka.ms/devtoolsforteaching) | IDE | Hlavní vývojové prostředí pro .Net | -| [Resharper](https://www.jetbrains.com/resharper/) | Doplněk | Nástroje na lepší produktivitu, refaktorování. Studentská licence je k dispozici zdarma [zde](https://www.jetbrains.com/student/) | +| [Visual Studio Enterprise 2026](https://aka.ms/devtoolsforteaching) | IDE | Vývojové prostředí pro .Net | +| [Resharper](https://www.jetbrains.com/resharper/) | Doplněk VS | Nástroje na lepší produktivitu, refaktorování. Studentská licence je k dispozici zdarma [zde](https://www.jetbrains.com/student/) | +| [Jetbrains Rider](https://www.jetbrains.com/rider/) | IDE | Vývojové prostředí pro .Net | | [LinqPad](http://www.linqpad.net/) | Samostatný program | Nástroj na přístup do databáze přes Linq, SQL… | | [DotPeek](https://www.jetbrains.com/decompiler/) | Samostatný program | Dekompilátor C# kódu | | [EF Core Power Tools](https://marketplace.visualstudio.com/items?itemName=ErikEJ.EFCorePowerTools) | Doplněk | Přidává funkcionalitu k DbContext jako je např. generování ER diagramů. | @@ -110,9 +111,9 @@ LXY - přednáška | EXY - democvičení | P0X - projekt +++ ```pwsh -winget install Microsoft.DotNet.SDK.8 +winget install Microsoft.DotNet.SDK.10 -winget install Microsoft.VisualStudio.2022.Community --override "--add Microsoft.VisualStudio.Workload.NetCrossPlat --add Microsoft.VisualStudio.Workload.Data --add Microsoft.VisualStudio.Workload.ManagedDesktop Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs" +winget install Microsoft.VisualStudio.2026.Community --override "--add Microsoft.VisualStudio.Workload.NetCrossPlat --add Microsoft.VisualStudio.Workload.Data --add Microsoft.VisualStudio.Workload.ManagedDesktop Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs" winget install JetBrains.Toolbox ``` @@ -123,7 +124,6 @@ winget install JetBrains.Toolbox | Nástroj | Typ | Popis | | ------------------------------------------------------ | ----------------- | --------------------------------------------------------- | -| [Rider](https://www.jetbrains.com/rider/) | IDE | Vývojové prostředí od JetBrains. | | [Roslynator](https://github.com/JosefPihrt/Roslynator) | Analyzér, Doplněk | Open-source alternativa k Resharper postavená nad Roslyn. | --- @@ -132,8 +132,9 @@ winget install JetBrains.Toolbox * [Martin Dybal](https://www.linkedin.com/in/martin-dybal) * [Roman Jašek](https://www.linkedin.com/in/roman-jasek-16921839) - [e-mail](mailto:roman.jasek@riganti.cz) * [Tibor Jašek](https://www.linkedin.com/in/tibor-jašek-717a5761) -* [Michal Mrnuštík](https://www.linkedin.com/in/michal-mrnušt%C3%ADk-31050b60/)* +* [Michal Mrnuštík](https://www.linkedin.com/in/michal-mrnušt%C3%ADk-31050b60/) * [Matěj Mudra](https://www.linkedin.com/in/matěj-mudra-a874461a9/) +* [Miroslav Šafář](https://www.linkedin.com/in/miroslav-safar/) * [Michal Tichý](mailto:edu@tichymichal.net) * [Jan Pluskal](https://www.fit.vut.cz/person/pluskal) @@ -150,7 +151,8 @@ winget install JetBrains.Toolbox --- # Užitečná literatura -* [C# 9.0 in a Nutshell](https://www.amazon.com/C-9-0-Nutshell-Definitive-Reference/dp/1098100964), Ben Albahari, Joseph Albahari +* [Welcome to C# 10 - devblogs](https://devblogs.microsoft.com/dotnet/welcome-to-csharp-10/) +* [C# 10.0 in a Nutshell](https://www.oreilly.com/library/view/c-10-in/9781098121945/), Joseph Albahari * [Clean Code: A Handbook of Agile Software Craftsmanship](https://books.google.cz/books?id=hjEFCAAAQBAJ), Robert C. Martin * [Agile Principles, Patterns, and Practices in C#](https://books.google.cz/books?id=hckt7v6g09oC), Robert C. Martin * [C# 3.0 Design Patterns](https://books.google.cz/books?id=pD2XMZLGUAYC), Judith Bishop From c9c8df657fca4e0b1bb2c36d68096ce3a141371f Mon Sep 17 00:00:00 2001 From: Jan Pluskal Date: Mon, 26 Jan 2026 09:31:47 +0100 Subject: [PATCH 2/2] feat(dotnet): basic update TargetFramework .net 10, CookBook tested on macos --- .../_site/assets/sln/Tests/Tests.csproj | 2 +- .../Lecture_01/assets/sln/Tests/Tests.csproj | 2 +- .../_site/assets/sln/Examples/Examples.csproj | 2 +- .../_site/assets/sln/Tests/Tests.csproj | 2 +- .../assets/sln/Examples/Examples.csproj | 2 +- .../Lecture_02/assets/sln/Tests/Tests.csproj | 2 +- .../Dapper.DAL.Tests/Dapper.DAL.Tests.csproj | 2 +- .../assets/sln/Dapper.DAL/Dapper.DAL.csproj | 2 +- .../School.BL.Tests/School.BL.Tests.csproj | 2 +- .../School.BL/School.BL.csproj | 2 +- .../School.DAL.Tests/School.DAL.Tests.csproj | 2 +- .../School.DAL/School.DAL.csproj | 2 +- .../_site/assets/sln/Examples/Examples.csproj | 2 +- .../Dapper.DAL.Tests/Dapper.DAL.Tests.csproj | 2 +- .../assets/sln/Dapper.DAL/Dapper.DAL.csproj | 2 +- .../School.BL.Tests/School.BL.Tests.csproj | 2 +- .../School.BL/School.BL.csproj | 2 +- .../School.DAL.Tests/School.DAL.Tests.csproj | 2 +- .../School.DAL/School.DAL.csproj | 2 +- .../assets/sln/Examples/Examples.csproj | 2 +- .../CookBook/CookBook.App/CookBook.App.csproj | 2 +- .../CookBook.BL.Tests.csproj | 2 +- .../CookBook/CookBook.BL/CookBook.BL.csproj | 2 +- .../CookBook.Common.Tests.csproj | 2 +- .../CookBook.Common/CookBook.Common.csproj | 2 +- .../CookBook.DAL.Tests.csproj | 2 +- .../CookBook/CookBook.DAL/CookBook.DAL.csproj | 2 +- .../AsynchronousProgramming.Samples.csproj | 2 +- .../AsynchronousProgramming.Samples.csproj | 2 +- flake.lock | 84 +++++++++++++------ flake.nix | 17 +--- nix/devShells/devel.nix | 2 +- src/CookBook/CookBook.App/CookBook.App.csproj | 8 +- src/CookBook/Directory.Build.props | 2 +- .../Calculator.App.csproj | 2 +- .../Calculator.Utils.Tests.csproj | 2 +- .../Calculator.Utils/Calculator.Utils.csproj | 2 +- .../ConsoleApp/ConsoleApp.csproj | 2 +- 38 files changed, 100 insertions(+), 79 deletions(-) diff --git a/Lectures/Lecture_01/_site/assets/sln/Tests/Tests.csproj b/Lectures/Lecture_01/_site/assets/sln/Tests/Tests.csproj index c6f1ec8..8992a57 100644 --- a/Lectures/Lecture_01/_site/assets/sln/Tests/Tests.csproj +++ b/Lectures/Lecture_01/_site/assets/sln/Tests/Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 Tests.HelloWorld diff --git a/Lectures/Lecture_01/assets/sln/Tests/Tests.csproj b/Lectures/Lecture_01/assets/sln/Tests/Tests.csproj index c6f1ec8..8992a57 100644 --- a/Lectures/Lecture_01/assets/sln/Tests/Tests.csproj +++ b/Lectures/Lecture_01/assets/sln/Tests/Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 Tests.HelloWorld diff --git a/Lectures/Lecture_02/_site/assets/sln/Examples/Examples.csproj b/Lectures/Lecture_02/_site/assets/sln/Examples/Examples.csproj index 58990cd..4340f62 100644 --- a/Lectures/Lecture_02/_site/assets/sln/Examples/Examples.csproj +++ b/Lectures/Lecture_02/_site/assets/sln/Examples/Examples.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_02/_site/assets/sln/Tests/Tests.csproj b/Lectures/Lecture_02/_site/assets/sln/Tests/Tests.csproj index a387680..d9b62e7 100644 --- a/Lectures/Lecture_02/_site/assets/sln/Tests/Tests.csproj +++ b/Lectures/Lecture_02/_site/assets/sln/Tests/Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false diff --git a/Lectures/Lecture_02/assets/sln/Examples/Examples.csproj b/Lectures/Lecture_02/assets/sln/Examples/Examples.csproj index 58990cd..4340f62 100644 --- a/Lectures/Lecture_02/assets/sln/Examples/Examples.csproj +++ b/Lectures/Lecture_02/assets/sln/Examples/Examples.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_02/assets/sln/Tests/Tests.csproj b/Lectures/Lecture_02/assets/sln/Tests/Tests.csproj index a387680..d9b62e7 100644 --- a/Lectures/Lecture_02/assets/sln/Tests/Tests.csproj +++ b/Lectures/Lecture_02/assets/sln/Tests/Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false diff --git a/Lectures/Lecture_04/_site/assets/sln/Dapper.DAL.Tests/Dapper.DAL.Tests.csproj b/Lectures/Lecture_04/_site/assets/sln/Dapper.DAL.Tests/Dapper.DAL.Tests.csproj index d0a04d6..6bb58f7 100644 --- a/Lectures/Lecture_04/_site/assets/sln/Dapper.DAL.Tests/Dapper.DAL.Tests.csproj +++ b/Lectures/Lecture_04/_site/assets/sln/Dapper.DAL.Tests/Dapper.DAL.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_04/_site/assets/sln/Dapper.DAL/Dapper.DAL.csproj b/Lectures/Lecture_04/_site/assets/sln/Dapper.DAL/Dapper.DAL.csproj index d309412..040f6c7 100644 --- a/Lectures/Lecture_04/_site/assets/sln/Dapper.DAL/Dapper.DAL.csproj +++ b/Lectures/Lecture_04/_site/assets/sln/Dapper.DAL/Dapper.DAL.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.BL.Tests/School.BL.Tests.csproj b/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.BL.Tests/School.BL.Tests.csproj index b063565..a460fe3 100644 --- a/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.BL.Tests/School.BL.Tests.csproj +++ b/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.BL.Tests/School.BL.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false diff --git a/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.BL/School.BL.csproj b/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.BL/School.BL.csproj index ce7092f..bf1febb 100644 --- a/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.BL/School.BL.csproj +++ b/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.BL/School.BL.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.DAL.Tests/School.DAL.Tests.csproj b/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.DAL.Tests/School.DAL.Tests.csproj index 606e8f3..9fce3c0 100644 --- a/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.DAL.Tests/School.DAL.Tests.csproj +++ b/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.DAL.Tests/School.DAL.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.DAL/School.DAL.csproj b/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.DAL/School.DAL.csproj index e125fdf..2ee7d35 100644 --- a/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.DAL/School.DAL.csproj +++ b/Lectures/Lecture_04/_site/assets/sln/EntityFramework/School.DAL/School.DAL.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable diff --git a/Lectures/Lecture_04/_site/assets/sln/Examples/Examples.csproj b/Lectures/Lecture_04/_site/assets/sln/Examples/Examples.csproj index 71e66ef..2522758 100644 --- a/Lectures/Lecture_04/_site/assets/sln/Examples/Examples.csproj +++ b/Lectures/Lecture_04/_site/assets/sln/Examples/Examples.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_04/assets/sln/Dapper.DAL.Tests/Dapper.DAL.Tests.csproj b/Lectures/Lecture_04/assets/sln/Dapper.DAL.Tests/Dapper.DAL.Tests.csproj index d0a04d6..6bb58f7 100644 --- a/Lectures/Lecture_04/assets/sln/Dapper.DAL.Tests/Dapper.DAL.Tests.csproj +++ b/Lectures/Lecture_04/assets/sln/Dapper.DAL.Tests/Dapper.DAL.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_04/assets/sln/Dapper.DAL/Dapper.DAL.csproj b/Lectures/Lecture_04/assets/sln/Dapper.DAL/Dapper.DAL.csproj index d309412..040f6c7 100644 --- a/Lectures/Lecture_04/assets/sln/Dapper.DAL/Dapper.DAL.csproj +++ b/Lectures/Lecture_04/assets/sln/Dapper.DAL/Dapper.DAL.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_04/assets/sln/EntityFramework/School.BL.Tests/School.BL.Tests.csproj b/Lectures/Lecture_04/assets/sln/EntityFramework/School.BL.Tests/School.BL.Tests.csproj index b063565..a460fe3 100644 --- a/Lectures/Lecture_04/assets/sln/EntityFramework/School.BL.Tests/School.BL.Tests.csproj +++ b/Lectures/Lecture_04/assets/sln/EntityFramework/School.BL.Tests/School.BL.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false diff --git a/Lectures/Lecture_04/assets/sln/EntityFramework/School.BL/School.BL.csproj b/Lectures/Lecture_04/assets/sln/EntityFramework/School.BL/School.BL.csproj index ce7092f..bf1febb 100644 --- a/Lectures/Lecture_04/assets/sln/EntityFramework/School.BL/School.BL.csproj +++ b/Lectures/Lecture_04/assets/sln/EntityFramework/School.BL/School.BL.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_04/assets/sln/EntityFramework/School.DAL.Tests/School.DAL.Tests.csproj b/Lectures/Lecture_04/assets/sln/EntityFramework/School.DAL.Tests/School.DAL.Tests.csproj index 606e8f3..9fce3c0 100644 --- a/Lectures/Lecture_04/assets/sln/EntityFramework/School.DAL.Tests/School.DAL.Tests.csproj +++ b/Lectures/Lecture_04/assets/sln/EntityFramework/School.DAL.Tests/School.DAL.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_04/assets/sln/EntityFramework/School.DAL/School.DAL.csproj b/Lectures/Lecture_04/assets/sln/EntityFramework/School.DAL/School.DAL.csproj index e125fdf..2ee7d35 100644 --- a/Lectures/Lecture_04/assets/sln/EntityFramework/School.DAL/School.DAL.csproj +++ b/Lectures/Lecture_04/assets/sln/EntityFramework/School.DAL/School.DAL.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable diff --git a/Lectures/Lecture_04/assets/sln/Examples/Examples.csproj b/Lectures/Lecture_04/assets/sln/Examples/Examples.csproj index 71e66ef..2522758 100644 --- a/Lectures/Lecture_04/assets/sln/Examples/Examples.csproj +++ b/Lectures/Lecture_04/assets/sln/Examples/Examples.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.App/CookBook.App.csproj b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.App/CookBook.App.csproj index 17d629e..2e3cd64 100644 --- a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.App/CookBook.App.csproj +++ b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.App/CookBook.App.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows + net10.0-windows enable true diff --git a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.BL.Tests/CookBook.BL.Tests.csproj b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.BL.Tests/CookBook.BL.Tests.csproj index 5e46d53..f8e2b38 100644 --- a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.BL.Tests/CookBook.BL.Tests.csproj +++ b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.BL.Tests/CookBook.BL.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 annotations false diff --git a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.BL/CookBook.BL.csproj b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.BL/CookBook.BL.csproj index f6a3621..89e7b11 100644 --- a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.BL/CookBook.BL.csproj +++ b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.BL/CookBook.BL.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable diff --git a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.Common.Tests/CookBook.Common.Tests.csproj b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.Common.Tests/CookBook.Common.Tests.csproj index 23f67dd..8487903 100644 --- a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.Common.Tests/CookBook.Common.Tests.csproj +++ b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.Common.Tests/CookBook.Common.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable diff --git a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.Common/CookBook.Common.csproj b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.Common/CookBook.Common.csproj index 58990cd..4340f62 100644 --- a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.Common/CookBook.Common.csproj +++ b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.Common/CookBook.Common.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 diff --git a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.DAL.Tests/CookBook.DAL.Tests.csproj b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.DAL.Tests/CookBook.DAL.Tests.csproj index b93704d..d1218d0 100644 --- a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.DAL.Tests/CookBook.DAL.Tests.csproj +++ b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.DAL.Tests/CookBook.DAL.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable false diff --git a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.DAL/CookBook.DAL.csproj b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.DAL/CookBook.DAL.csproj index 055023a..ff895cc 100644 --- a/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.DAL/CookBook.DAL.csproj +++ b/Lectures/Lecture_06/CookBookCI/CookBook/CookBook.DAL/CookBook.DAL.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable diff --git a/Lectures/Lecture_10/_site/assets/sln/AsynchronousProgramming.Samples/AsynchronousProgramming.Samples.csproj b/Lectures/Lecture_10/_site/assets/sln/AsynchronousProgramming.Samples/AsynchronousProgramming.Samples.csproj index a729b1c..09e6219 100644 --- a/Lectures/Lecture_10/_site/assets/sln/AsynchronousProgramming.Samples/AsynchronousProgramming.Samples.csproj +++ b/Lectures/Lecture_10/_site/assets/sln/AsynchronousProgramming.Samples/AsynchronousProgramming.Samples.csproj @@ -1,7 +1,7 @@  WinExe - net8.0-windows + net10.0-windows false true diff --git a/Lectures/Lecture_10/assets/sln/AsynchronousProgramming.Samples/AsynchronousProgramming.Samples.csproj b/Lectures/Lecture_10/assets/sln/AsynchronousProgramming.Samples/AsynchronousProgramming.Samples.csproj index a729b1c..09e6219 100644 --- a/Lectures/Lecture_10/assets/sln/AsynchronousProgramming.Samples/AsynchronousProgramming.Samples.csproj +++ b/Lectures/Lecture_10/assets/sln/AsynchronousProgramming.Samples/AsynchronousProgramming.Samples.csproj @@ -1,7 +1,7 @@  WinExe - net8.0-windows + net10.0-windows false true diff --git a/flake.lock b/flake.lock index 2dcc202..3533ee8 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -20,9 +20,7 @@ }, "haumea": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1708375098, @@ -40,30 +38,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739055578, - "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-reveal-md": { @@ -82,27 +82,57 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1769089682, + "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", "haumea": "haumea", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-reveal-md": "nixpkgs-reveal-md", "treefmt-nix": "treefmt-nix" } }, "treefmt-nix": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1738953846, - "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "lastModified": 1769353635, + "narHash": "sha256-J0G1ACrUK29M0THPAsz429eZX07GmR9Bs/b0pB3N0dQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "rev": "f46bb205f239b415309f58166f8df6919fa88377", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 19ba3a5..56ce41b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,19 +1,10 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-reveal-md.url = "github:NixOS/nixpkgs/nixos-24.05"; - flake-parts = { - url = "github:hercules-ci/flake-parts"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - treefmt-nix = { - url = "github:numtide/treefmt-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - haumea = { - url = "github:nix-community/haumea"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + flake-parts.url = "github:hercules-ci/flake-parts"; + treefmt-nix.url = "github:numtide/treefmt-nix"; + haumea.url = "github:nix-community/haumea"; }; outputs = diff --git a/nix/devShells/devel.nix b/nix/devShells/devel.nix index ae9c51a..9b14e14 100644 --- a/nix/devShells/devel.nix +++ b/nix/devShells/devel.nix @@ -6,7 +6,7 @@ pkgs.mkShell { stdenv = pkgs.stdenvNoCc; nativeBuildInputs = with pkgs; [ - dotnetCorePackages.dotnet_8.sdk + dotnetCorePackages.dotnet_10.sdk nodePackages.mermaid-cli nodejs http-server diff --git a/src/CookBook/CookBook.App/CookBook.App.csproj b/src/CookBook/CookBook.App/CookBook.App.csproj index ef2eafe..f7df036 100644 --- a/src/CookBook/CookBook.App/CookBook.App.csproj +++ b/src/CookBook/CookBook.App/CookBook.App.csproj @@ -1,8 +1,8 @@  - net8.0-maccatalyst - net8.0-windows10.0.19041.0 + net10.0-maccatalyst + net10.0-windows10.0.19041.0 Exe CookBook.App true @@ -32,11 +32,11 @@ 00775e36-5374-4630-b80a-38bf58169d4e - + True - + False diff --git a/src/CookBook/Directory.Build.props b/src/CookBook/Directory.Build.props index 593812f..06a29ad 100644 --- a/src/CookBook/Directory.Build.props +++ b/src/CookBook/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net10.0 enable preview enable diff --git a/src/Exercise-01-ConsoleApp/Calculator.Console.App/Calculator.App.csproj b/src/Exercise-01-ConsoleApp/Calculator.Console.App/Calculator.App.csproj index 82aee85..8b1d600 100644 --- a/src/Exercise-01-ConsoleApp/Calculator.Console.App/Calculator.App.csproj +++ b/src/Exercise-01-ConsoleApp/Calculator.Console.App/Calculator.App.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 enable latest Calculator.App diff --git a/src/Exercise-01-ConsoleApp/Calculator.Utils.Tests/Calculator.Utils.Tests.csproj b/src/Exercise-01-ConsoleApp/Calculator.Utils.Tests/Calculator.Utils.Tests.csproj index 91636c7..71ab80c 100644 --- a/src/Exercise-01-ConsoleApp/Calculator.Utils.Tests/Calculator.Utils.Tests.csproj +++ b/src/Exercise-01-ConsoleApp/Calculator.Utils.Tests/Calculator.Utils.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 Calculator.Utils.Tests false diff --git a/src/Exercise-01-ConsoleApp/Calculator.Utils/Calculator.Utils.csproj b/src/Exercise-01-ConsoleApp/Calculator.Utils/Calculator.Utils.csproj index 5f0ea71..4c4a674 100644 --- a/src/Exercise-01-ConsoleApp/Calculator.Utils/Calculator.Utils.csproj +++ b/src/Exercise-01-ConsoleApp/Calculator.Utils/Calculator.Utils.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable latest Calculator.Utils diff --git a/src/Exercise-01-ConsoleApp/ConsoleApp/ConsoleApp.csproj b/src/Exercise-01-ConsoleApp/ConsoleApp/ConsoleApp.csproj index 37a0497..6b0a690 100644 --- a/src/Exercise-01-ConsoleApp/ConsoleApp/ConsoleApp.csproj +++ b/src/Exercise-01-ConsoleApp/ConsoleApp/ConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 enable latest Exercise_01.ConsoleApp