asp

Inxton · Nov 21, 2023 · 7000595 · 7000595
1 parent 467eefa
commit 7000595
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 25 deletions.
diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs
@@ -66,7 +66,7 @@ public BuildContext(ICakeContext context, BuildParameters buildParameters)
             NoRestore = false,
             MSBuildSettings = new DotNetMSBuildSettings()
             {
-                Verbosity = DotNetVerbosity.Quiet
+                Verbosity = buildParameters.Verbosity
             }
         };
 

diff --git a/cake/Program.cs b/cake/Program.cs
@@ -414,8 +414,13 @@ public override void Run(BuildContext context)
             return;
         }
 
+
+
         PackTemplatePackages(context,
-            Path.Combine(context.TemplatesDir, "AXSharp.templates.sln"));
+            Path.Combine(context.TemplatesDir,"working", "AXSharp.templates.sln"));
+
+
+
         context.PushNugetPackages("templates");
 
         context.CheckLicenseComplianceInArtifacts();

diff --git a/templates/working/AXSharp.templates.csproj b/templates/working/AXSharp.templates.csproj
@@ -22,9 +22,13 @@
     <Compile Remove="**\*" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\assets\icons\icon_128_128.png" Link="templates\icon_128_128.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\src\NUGET-README.md" Link="templates\NUGET-README.md" />
+    <None Include="..\..\assets\icons\icon_128_128.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+    <None Include="..\..\src\NUGET-README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/templates/working/templates/axsharpblazor/.config/dotnet-tools.json b/templates/working/templates/axsharpblazor/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "AXSharp.ixc": {
-      "version": "0.17.0-PTKu-patch-2.169",
+      "version": "0.17.0-alpha.169",
       "commands": [
         "ixc"
       ]

diff --git a/templates/working/templates/axsharpblazor/ax/AXSharp.config.json b/templates/working/templates/axsharpblazor/ax/AXSharp.config.json
@@ -1 +1 @@
-{"OutputProjectFolder":"..\\axsharpblazor.twin"}
+{"OutputProjectFolder":"..\\axsharpblazor.twin","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"axsharpblazor.csproj"}
diff --git a/templates/working/templates/axsharpblazor/ax/axsharp.companion.json b/templates/working/templates/axsharpblazor/ax/axsharp.companion.json
@@ -0,0 +1 @@
+{"Id":"axsharpblazor","Version":"0.0.0"}
diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj
@@ -17,7 +17,7 @@
     <Content Include="Shared\Menu\ExpandableMenuItem.razor.css" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Presentation.Blazor.Controls" Version="0.17.0-PTKu-patch-2.169" />
+    <PackageReference Include="AXSharp.Presentation.Blazor.Controls" Version="0.17.0-alpha.169" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.2" />

diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Abstractions" Version="0.17.0-PTKu-patch-2.169" />
-    <PackageReference Include="AXSharp.Connector" Version="0.17.0-PTKu-patch-2.169" />
+    <PackageReference Include="AXSharp.Abstractions" Version="0.17.0-alpha.169" />
+    <PackageReference Include="AXSharp.Connector" Version="0.17.0-alpha.169" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include=".g\**" />

diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Abstractions" Version="0.17.0-PTKu-patch-2.169" />
-    <PackageReference Include="AXSharp.Connector" Version="0.17.0-PTKu-patch-2.169" />
-    <PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.17.0-PTKu-patch-2.169" />
+    <PackageReference Include="AXSharp.Abstractions" Version="0.17.0-alpha.169" />
+    <PackageReference Include="AXSharp.Connector" Version="0.17.0-alpha.169" />
+    <PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.17.0-alpha.169" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include=".g\**" />

diff --git a/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Abstractions" Version="0.17.0-PTKu-patch-2.169" />
-    <PackageReference Include="AXSharp.Connector" Version="0.17.0-PTKu-patch-2.169" />
+    <PackageReference Include="AXSharp.Abstractions" Version="0.17.0-alpha.169" />
+    <PackageReference Include="AXSharp.Connector" Version="0.17.0-alpha.169" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include=".g\**" />

diff --git a/templates/working/templates/axsharpconsole/.config/dotnet-tools.json b/templates/working/templates/axsharpconsole/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "AXSharp.ixc": {
-      "version": "0.17.0-PTKu-patch-2.169",
+      "version": "0.17.0-alpha.169",
       "commands": [
         "ixc"
       ]

diff --git a/templates/working/templates/axsharpconsole/ax/AXSharp.config.json b/templates/working/templates/axsharpconsole/ax/AXSharp.config.json
@@ -1 +1 @@
-{"OutputProjectFolder":"..\\axsharpconsole.twin"}
+{"OutputProjectFolder":"..\\axsharpconsole.twin","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"axsharpconsole.csproj"}
diff --git a/templates/working/templates/axsharpconsole/ax/axsharp.companion.json b/templates/working/templates/axsharpconsole/ax/axsharp.companion.json
@@ -0,0 +1 @@
+{"Id":"axsharpconsole","Version":"0.0.0"}
diff --git a/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AXSharp.Abstractions" Version="0.17.0-PTKu-patch-2.169" />
-    <PackageReference Include="AXSharp.Connector" Version="0.17.0-PTKu-patch-2.169" />
-    <PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.17.0-PTKu-patch-2.169" />
+    <PackageReference Include="AXSharp.Abstractions" Version="0.17.0-alpha.169" />
+    <PackageReference Include="AXSharp.Connector" Version="0.17.0-alpha.169" />
+    <PackageReference Include="AXSharp.Connector.S71500.WebAPI" Version="0.17.0-alpha.169" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include=".g\**" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"OutputProjectFolder":"..\\axsharpblazor.twin"}
		{"OutputProjectFolder":"..\\axsharpblazor.twin","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"axsharpblazor.csproj"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"OutputProjectFolder":"..\\axsharpconsole.twin"}
		{"OutputProjectFolder":"..\\axsharpconsole.twin","UseBase":false,"NoDependencyUpdate":false,"ProjectFile":"axsharpconsole.csproj"}