Skip to content
This repository has been archived by the owner on Oct 29, 2024. It is now read-only.

Commit

Permalink
🆙 6.9.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
volkanceylan committed Dec 7, 2023
1 parent 9a0d8fa commit 619cf63
Show file tree
Hide file tree
Showing 13 changed files with 355 additions and 199 deletions.
4 changes: 2 additions & 2 deletions build-serene.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ goto run_build

:run_build
echo *** RUNNING BUILD ***
dotnet run --project build\build-serene.csproj --no-dependencies
dotnet run --project build\build-serene.csproj --no-dependencies -- %*
if %ERRORLEVEL% GEQ 1 GOTO :error
goto build_nuget_package

:build_nuget_package
echo *** BUILDING NUGET PACKAGE ***
dotnet pack --no-dependencies vsix\Serene.Templates\Serene.Templates.csproj
dotnet pack --no-dependencies -p:SkipPatchPackageJson=true vsix\Serene.Templates\Serene.Templates.csproj
if %ERRORLEVEL% GEQ 1 GOTO :error
goto build_vsix_package

Expand Down
45 changes: 23 additions & 22 deletions build/build-serene.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin</OutputPath>
<TargetFramework>net6.0</TargetFramework>
<SharedSrc>..\common-features\build\shared</SharedSrc>
<DefineConstants>$(DefineConstants);IsTemplateBuild</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NuGet.Protocol" Version="6.0.5" />
</ItemGroup>

<ItemGroup>
<Compile Include="$(SharedSrc)\**\*.cs">
<Link>shared\%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin</OutputPath>
<TargetFramework>net8.0</TargetFramework>
<SharedSrc>..\common-features\build\shared</SharedSrc>
<DefaultItemExcludes>$(DefaultItemExcludes);artifacts\**</DefaultItemExcludes>
<DefineConstants>$(DefineConstants);IsTemplateBuild</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NuGet.Protocol" Version="6.7.0" />
</ItemGroup>

<ItemGroup>
<Compile Include="$(SharedSrc)\**\*.cs">
<Link>shared\%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
</Project>
55 changes: 27 additions & 28 deletions build/src/Program.cs
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
using System;

namespace Build
{
partial class Program
{
static void Main(string[] args)
{
var target = args != null && args.Length > 1 ? args[1] : "vsix";

Shared.DetermineRoot();

switch (target)
{
case "vsix":
Shared.Targets.PrepareVSIX();
break;

case "patchpackagejson":
Shared.Targets.PatchPackageJsonCopy();
break;

default:
Console.Error.WriteLine("Unknown target!");
break;
}
}
}
using System;

namespace Build
{
partial class Program
{
static void Main(string[] args)
{
Shared.DetermineRoot();

var target = Shared.GetTarget(new(args));
switch (target)
{
case "vsix":
Shared.Targets.PrepareVSIX();
break;

case "patchpackagejson":
Shared.Targets.PatchPackageJsonCopy();
break;

default:
Console.Error.WriteLine("Unknown target!");
break;
}
}
}
}
6 changes: 3 additions & 3 deletions src/Serene.Web/Serene.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
<PackageReference Include="Serenity.Assets" Version="6.9.6" />
<PackageReference Include="Serenity.Scripts" Version="6.9.6" />
<PackageReference Include="Serenity.Net.Web" Version="6.9.6" />
<PackageReference Include="Serenity.Extensions" Version="6.9.6" />
<PackageReference Include="Serenity.Extensions" Version="6.9.6.4" />
<!--#if (Northwind)-->
<PackageReference Include="Serenity.Demo.Northwind" Version="6.9.6" />
<PackageReference Include="Serenity.Demo.Northwind" Version="6.9.6.4" />
<!--#endif-->
<!--#if (BasicSamples)-->
<PackageReference Include="Serenity.Demo.BasicSamples" Version="6.9.6" />
<PackageReference Include="Serenity.Demo.BasicSamples" Version="6.9.6.4" />
<!--#endif-->
</ItemGroup>
<ItemGroup Condition="'$(UseProjectRefs)' != 'false'">
Expand Down
4 changes: 2 additions & 2 deletions src/Serene.Web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"name": "serene.web",
"dependencies": {
"@serenity-is/corelib": "file:../../Serenity/packages/corelib",
"@serenity-is/sleekgrid": "1.6.2",
"@serenity-is/sleekgrid": "1.6.3",
"@types/jquery": "2.0.48",
"@types/jqueryui": "1.12.6",
"@types/jquery.validation": "1.16.7",
"jsx-dom": "8.0.7",
"preact": "10.15.0"
},
"devDependencies": {
"@serenity-is/tsbuild": "6.9.8"
"@serenity-is/tsbuild": "6.9.10"
},
"scripts": {
"build": "npm run tsbuild",
Expand Down
2 changes: 1 addition & 1 deletion src/Serene.Web/sergen.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
},
"UpgradeInfo": {
"InitialType": "Community",
"InitialVersion": "6.9.6.3"
"InitialVersion": "6.9.6.4"
}
}
Loading

0 comments on commit 619cf63

Please sign in to comment.