From 0da5301774a5adb6362f9ce8683853fa9afcb5d9 Mon Sep 17 00:00:00 2001 From: Jon Thysell Date: Sun, 31 Dec 2023 16:40:06 -0800 Subject: [PATCH] Upgrade to dotnet8.0 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/pub.yml | 6 +++--- LICENSE.md | 2 +- README.md | 2 +- scripts/BuildLinux.ps1 | 2 +- scripts/BuildMacOS.ps1 | 2 +- scripts/BuildWin32.ps1 | 2 +- scripts/BuildWin64.ps1 | 2 +- scripts/Licenses.txt | 2 +- src/Directory.Build.props | 4 ++-- src/NativeExamples/Breakdown/Breakdown.csproj | 2 +- src/NativeExamples/Carwash/Carwash.csproj | 2 +- src/TEGS/CodeGenerator.cs | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e0371f..226c112 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Checkout uses: actions/checkout@v2 @@ -53,7 +53,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Checkout uses: actions/checkout@v2 @@ -80,7 +80,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f55a7ae..8c4cab8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,7 +20,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Checkout uses: actions/checkout@v2 @@ -35,4 +35,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: ${{ matrix.configuration }}Binaries - path: ${{ env.BinDir }}/${{ matrix.configuration }}/net6.0 + path: ${{ env.BinDir }}/${{ matrix.configuration }}/net8.0 diff --git a/.github/workflows/pub.yml b/.github/workflows/pub.yml index b339214..9cbb578 100644 --- a/.github/workflows/pub.yml +++ b/.github/workflows/pub.yml @@ -48,7 +48,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Checkout uses: actions/checkout@v2 @@ -77,7 +77,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Checkout uses: actions/checkout@v2 @@ -106,7 +106,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Checkout uses: actions/checkout@v2 diff --git a/LICENSE.md b/LICENSE.md index 206568e..5dbfcec 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019-2022 Jon Thysell +Copyright (c) 2019-2023 Jon Thysell Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index b56b270..9fb8194 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ TEGS is an application for modeling discrete-event simulations using event graph TEGS is open-source under the MIT license. -Copyright (c) 2019-2022 Jon Thysell +Copyright (c) 2019-2023 Jon Thysell diff --git a/scripts/BuildLinux.ps1 b/scripts/BuildLinux.ps1 index 3353272..3829e95 100644 --- a/scripts/BuildLinux.ps1 +++ b/scripts/BuildLinux.ps1 @@ -3,6 +3,6 @@ param() [string] $Product = "TEGS" [string] $Target = "Linux" -& "$PSScriptRoot\Build.ps1" -Product $Product -Target $Target -BuildArgs "-target:Publish -p:RuntimeIdentifier=linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeAllContentForSelfExtract=true -p:EnableCompressionInSingleFile=true" +& "$PSScriptRoot\Build.ps1" -Product $Product -Target $Target -BuildArgs "-target:Publish -p:RuntimeIdentifier=linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeAllContentForSelfExtract=true -p:SelfContained=true -p:EnableCompressionInSingleFile=true" & "$PSScriptRoot\TarRelease.ps1" -Product $Product -Target $Target diff --git a/scripts/BuildMacOS.ps1 b/scripts/BuildMacOS.ps1 index 5190823..7df620c 100644 --- a/scripts/BuildMacOS.ps1 +++ b/scripts/BuildMacOS.ps1 @@ -1,6 +1,6 @@ [string] $Product = "TEGS" [string] $Target = "MacOS" -& "$PSScriptRoot\Build.ps1" -Product $Product -Target $Target -Clean $False -BuildArgs "-t:Publish -p:RuntimeIdentifier=osx-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeAllContentForSelfExtract=true -p:EnableCompressionInSingleFile=true" +& "$PSScriptRoot\Build.ps1" -Product $Product -Target $Target -Clean $False -BuildArgs "-t:Publish -p:RuntimeIdentifier=osx-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeAllContentForSelfExtract=true -p:SelfContained=true -p:EnableCompressionInSingleFile=true" & "$PSScriptRoot\TarRelease.ps1" -Product $Product -Target $Target diff --git a/scripts/BuildWin32.ps1 b/scripts/BuildWin32.ps1 index a7c2693..cfbc431 100644 --- a/scripts/BuildWin32.ps1 +++ b/scripts/BuildWin32.ps1 @@ -3,6 +3,6 @@ param() [string] $Product = "TEGS" [string] $Target = "Win32" -& "$PSScriptRoot\Build.ps1" -Product $Product -Target $Target -BuildArgs "-target:Publish -p:RuntimeIdentifier=win-x86 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeAllContentForSelfExtract=true -p:EnableCompressionInSingleFile=true" +& "$PSScriptRoot\Build.ps1" -Product $Product -Target $Target -BuildArgs "-target:Publish -p:RuntimeIdentifier=win-x86 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeAllContentForSelfExtract=true -p:SelfContained=true -p:EnableCompressionInSingleFile=true" & "$PSScriptRoot\ZipRelease.ps1" -Product $Product -Target $Target diff --git a/scripts/BuildWin64.ps1 b/scripts/BuildWin64.ps1 index 8d8ed00..8972a28 100644 --- a/scripts/BuildWin64.ps1 +++ b/scripts/BuildWin64.ps1 @@ -3,6 +3,6 @@ param() [string] $Product = "TEGS" [string] $Target = "Win64" -& "$PSScriptRoot\Build.ps1" -Product $Product -Target $Target -BuildArgs "-target:Publish -p:RuntimeIdentifier=win-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeAllContentForSelfExtract=true -p:EnableCompressionInSingleFile=true" +& "$PSScriptRoot\Build.ps1" -Product $Product -Target $Target -BuildArgs "-target:Publish -p:RuntimeIdentifier=win-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:IncludeAllContentForSelfExtract=true -p:SelfContained=true -p:EnableCompressionInSingleFile=true" & "$PSScriptRoot\ZipRelease.ps1" -Product $Product -Target $Target diff --git a/scripts/Licenses.txt b/scripts/Licenses.txt index 09394c3..4738363 100644 --- a/scripts/Licenses.txt +++ b/scripts/Licenses.txt @@ -2,7 +2,7 @@ MIT License -Copyright (c) 2019-2022 Jon Thysell +Copyright (c) 2019-2023 Jon Thysell Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 254d948..b1046e4 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -4,10 +4,10 @@ TEGS Jon Thysell Jon Thysell - Copyright © 2019-2022 Jon Thysell + Copyright © 2019-2023 Jon Thysell LICENSE.md https://github.com/jonthysell/tegs - net6.0 + net8.0 0.9.0 $(Version).0 $(AssemblyVersion) diff --git a/src/NativeExamples/Breakdown/Breakdown.csproj b/src/NativeExamples/Breakdown/Breakdown.csproj index 99b8a5e..bf54091 100644 --- a/src/NativeExamples/Breakdown/Breakdown.csproj +++ b/src/NativeExamples/Breakdown/Breakdown.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Breakdown.Program diff --git a/src/NativeExamples/Carwash/Carwash.csproj b/src/NativeExamples/Carwash/Carwash.csproj index c5980f1..e14616e 100644 --- a/src/NativeExamples/Carwash/Carwash.csproj +++ b/src/NativeExamples/Carwash/Carwash.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Carwash.Program diff --git a/src/TEGS/CodeGenerator.cs b/src/TEGS/CodeGenerator.cs index 68c29f2..07438a6 100644 --- a/src/TEGS/CodeGenerator.cs +++ b/src/TEGS/CodeGenerator.cs @@ -24,7 +24,7 @@ public static string GenerateProject(string targetNamespace) Exe - net6.0 + net8.0 {0}.Program