diff --git a/.DS_Store b/.DS_Store index cba700e..5575f66 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Client/SZUAbsolventenverein.Theme.Website.Client.csproj b/Client/SZUAbsolventenverein.Theme.Website.Client.csproj index 8a30475..5bae1ea 100644 --- a/Client/SZUAbsolventenverein.Theme.Website.Client.csproj +++ b/Client/SZUAbsolventenverein.Theme.Website.Client.csproj @@ -1,8 +1,8 @@ - net9.0 - 1.0.12 + net10.0 + 1.0.0 SZUAbsolventenverein SZUAbsolventenverein [Description] @@ -13,14 +13,14 @@ - - - + + + - ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Client.dll - ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll + ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Client.dll + ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net10.0\Oqtane.Shared.dll diff --git a/Client/ThemeInfo.cs b/Client/ThemeInfo.cs index bb9564d..6dc7f3c 100644 --- a/Client/ThemeInfo.cs +++ b/Client/ThemeInfo.cs @@ -10,7 +10,7 @@ namespace SZUAbsolventenverein.Theme.Website public Oqtane.Models.Theme Theme => new Oqtane.Models.Theme { Name = "SZUAbsolventenverein Website", - Version = "1.0.12", + Version = "1.0.16", PackageName = "SZUAbsolventenverein.Theme.Website", ThemeSettingsType = "SZUAbsolventenverein.Theme.Website.ThemeSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane", ContainerSettingsType = "SZUAbsolventenverein.Theme.Website.ContainerSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane", diff --git a/Package/SZUAbsolventenverein.Theme.Website.Package.csproj b/Package/SZUAbsolventenverein.Theme.Website.Package.csproj index 7a5d49e..529c0ac 100644 --- a/Package/SZUAbsolventenverein.Theme.Website.Package.csproj +++ b/Package/SZUAbsolventenverein.Theme.Website.Package.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 false false SZUAbsolventenverein.Theme.Website diff --git a/Package/SZUAbsolventenverein.Theme.Website.nuspec b/Package/SZUAbsolventenverein.Theme.Website.nuspec index 8e0a7cb..e826392 100644 --- a/Package/SZUAbsolventenverein.Theme.Website.nuspec +++ b/Package/SZUAbsolventenverein.Theme.Website.nuspec @@ -2,7 +2,7 @@ SZUAbsolventenverein.Theme.Website - 1.0.12 + 1.0.16 SZUAbsolventenverein SZUAbsolventenverein Website @@ -16,7 +16,7 @@ - + diff --git a/Package/debug.sh b/Package/debug.sh index e2e18ae..deb759e 100644 --- a/Package/debug.sh +++ b/Package/debug.sh @@ -1,8 +1,10 @@ #!/bin/bash - +set -x TargetFramework=$1 ProjectName=$2 -cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" -cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" -cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/" \ No newline at end of file +whoami + +cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -rf "../Client/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/" \ No newline at end of file diff --git a/Package/release.sh b/Package/release.sh index 0e0be9c..612c5c1 100755 --- a/Package/release.sh +++ b/Package/release.sh @@ -2,6 +2,7 @@ TargetFramework=$1 ProjectName=$2 cd "$(dirname "$0")" -rm -f *.nupkg -dotnet build "../Client/SZUAbsolventenverein.Theme.Website.Client.csproj" -c Release -dotnet pack "${ProjectName}.Package.csproj" -p:NuspecFile="${ProjectName}.nuspec" -p:NuspecProperties="targetframework=${TargetFramework};projectname=${ProjectName}" --no-build -o . \ No newline at end of file + +find . -name *.nupkg -delete +dotnet pack $ProjectName.nuspec "/p:targetframework=${TargetFramework};ProjectName=${ProjectName}" +cp -f *.nupkg ../../oqtane.framework/Oqtane.Server/Packages/ diff --git a/SZUAbsolventenverein.Theme.Website.sln b/SZUAbsolventenverein.Theme.Website.sln deleted file mode 100644 index 12d9460..0000000 --- a/SZUAbsolventenverein.Theme.Website.sln +++ /dev/null @@ -1,34 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.13.35825.156 d17.13 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\oqtane.framework\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Theme.Website.Client", "Client\SZUAbsolventenverein.Theme.Website.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Theme.Website.Package", "Package\SZUAbsolventenverein.Theme.Website.Package.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.Build.0 = Release|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {1D016F15-46FE-4726-8DFD-2E4FD4DC7668} - EndGlobalSection -EndGlobal diff --git a/SZUAbsolventenverein.Theme.Website.slnx b/SZUAbsolventenverein.Theme.Website.slnx new file mode 100644 index 0000000..6a91ce0 --- /dev/null +++ b/SZUAbsolventenverein.Theme.Website.slnx @@ -0,0 +1,7 @@ + + + + + + +