update csproj files to all have platforms specified. remove -A from b…

…uild. add expected alignment check files for posterity.
openziti · Oct 7, 2023 · 8f4d1fe · 8f4d1fe
1 parent 2458692
commit 8f4d1fe
Show file tree

Hide file tree

Showing 8 changed files with 437 additions and 6 deletions.
diff --git a/.github/workflows/native-nuget-publish.yml b/.github/workflows/native-nuget-publish.yml
@@ -98,7 +98,6 @@ jobs:
           - ext: dll
             dist: win
             arch: x86
-            cmake_arch_flag: '-A Win32'
             os: windows-2022
             preset: win32
     steps:
@@ -144,7 +143,7 @@ jobs:
         run: |
           echo "VCPKG_ROOT = ${{ env.VCPKG_ROOT }}"
           cmake -E make_directory ${{ env.TARGETDIR }}
-          cmake -S ${{ env.BASEDIR }} -B ${{ env.TARGETDIR }} --preset ${{ matrix.preset }} ${{ matrix.cmake_arch_flag }}
+          cmake -S ${{ env.BASEDIR }} -B ${{ env.TARGETDIR }} --preset ${{ matrix.preset }}
           cmake --build ${{ env.TARGETDIR }} --config ${{ env.ZITI_DEBUG_OR_RELEASE }}
           
       - name: upload artifacts

diff --git a/OpenZiti.NET.Samples.Petstore/OpenZiti.NET.Samples.Petstore.csproj b/OpenZiti.NET.Samples.Petstore/OpenZiti.NET.Samples.Petstore.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
+        <Platforms>AnyCPU;x86;x64;ARM64;ARM</Platforms>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/OpenZiti.NET.Samples/OpenZiti.NET.Samples.csproj b/OpenZiti.NET.Samples/OpenZiti.NET.Samples.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+    <Platforms>AnyCPU;x86;x64;ARM64;ARM</Platforms>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/OpenZiti.NET.Samples/src/Common/SampleSetup.cs b/OpenZiti.NET.Samples/src/Common/SampleSetup.cs
@@ -27,8 +27,8 @@ limitations under the License.
 namespace OpenZiti.NET.Samples.Common {
     public class SampleSetup {
         private static readonly NLog.Logger Log = NLog.LogManager.GetCurrentClassLogger();
-        
-        public static bool Initialize { get; set; }
+
+        public static bool Initialize { get; set; } = true;
 
         private static string _idFile;
         public static string IdentityFile {

diff --git a/OpenZiti.NET.Tests/OpenZiti.NET.Tests.csproj b/OpenZiti.NET.Tests/OpenZiti.NET.Tests.csproj
@@ -2,9 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
     <Platforms>AnyCPU;x86;x64;ARM64;ARM</Platforms>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)' == 'AnyCPU'">

diff --git a/OpenZiti.NET/OpenZiti.NET.csproj b/OpenZiti.NET/OpenZiti.NET.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net6.0</TargetFrameworks>
+        <Platforms>AnyCPU;x86;x64;ARM64;ARM</Platforms>
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
         <CurrentYear>$([System.DateTime]::UtcNow.Year.ToString().Substring(2,2))</CurrentYear>
         <UtcDayOfYear>$([System.DateTime]::UtcNow.DayOfYear)</UtcDayOfYear>

diff --git a/ZitiNativeApiForDotnetCore/alignments-32bit.txt b/ZitiNativeApiForDotnetCore/alignments-32bit.txt
@@ -0,0 +1,215 @@
+
+offset output begins
+
+offset of ziti_types_v2.ziti_auth_query_mfa.ziti_auth_query_mfa: 4 size: 28
+offset of ziti_types_v2.ziti_id_cfg.ziti_id_cfg: 16 size: 12
+offset of ziti_types_v2.ziti_config.ziti_config: 28 size: 20
+offset of ziti_types_v2.api_path.api_path: 40 size: 4
+offset of ziti_types_v2.ziti_api_versions.ziti_api_versions: 52 size: 4
+offset of ziti_types_v2.ziti_version.ziti_version: 64 size: 16
+offset of ziti_types_v2.ziti_identity.ziti_identity: 76 size: 12
+offset of ziti_types_v2.ziti_process.ziti_process: 88 size: 4
+offset of ziti_types_v2.ziti_posture_query.ziti_posture_query: 100 size: 32
+offset of ziti_types_v2.ziti_posture_query_set.ziti_posture_query_set: 112 size: 16
+offset of ziti_types_v2.ziti_session_type.ziti_session_type: 124 size: 4
+offset of ziti_types_v2.ziti_service.ziti_service: 136 size: 36
+offset of ziti_types_v2.ziti_address.ziti_address_host: 148 size: 260
+offset of ziti_types_v2.ziti_address.ziti_address_cidr: 160 size: 260
+offset of ziti_types_v2.ziti_client_cfg_v1.ziti_client_cfg_v1: 172 size: 264
+offset of ziti_types_v2.ziti_intercept_cfg_v1.ziti_intercept_cfg_v1: 184 size: 20
+offset of ziti_types_v2.ziti_server_cfg_v1.ziti_server_cfg_v1: 196 size: 12
+offset of ziti_types_v2.ziti_listen_options.ziti_listen_options: 208 size: 40
+offset of ziti_types_v2.ziti_host_cfg_v1.ziti_host_cfg_v1: 220 size: 44
+offset of ziti_types_v2.ziti_host_cfg_v2.ziti_host_cfg_v2: 232 size: 4
+offset of ziti_types_v2.ziti_mfa_enrollment.ziti_mfa_enrollment: 244 size: 12
+offset of ziti_types_v2.ziti_port_range.ziti_port_range: 256 size: 8
+offset of ziti_types_v2.ziti_options.ziti_options: 268 size: 56
+offset of ziti_types_v2.ziti_event_t.ziti_context_event: 280 size: 20
+offset of ziti_types_v2.ziti_event_t.ziti_router_event: 292 size: 20
+offset of ziti_types_v2.ziti_event_t.ziti_service_event: 304 size: 20
+offset of ziti_types_v2.ziti_event_t.ziti_mfa_auth_event: 316 size: 20
+offset of ziti_types_v2.ziti_event_t.ziti_api_event: 328 size: 20
+
+---------------- suboffsets begin ----------------
+offset of ziti_types_v2.ziti_posture_query_set.policy_id
+  position in ziti_types_v2: 112
+                 in struct : 0
+                      size : 16
+offset of ziti_types_v2.ziti_posture_query_set.is_passing
+  position in ziti_types_v2: 116
+                 in struct : 4
+                      size : 16
+offset of ziti_types_v2.ziti_posture_query_set.policy_type
+  position in ziti_types_v2: 120
+                 in struct : 8
+                      size : 16
+offset of ziti_types_v2.ziti_posture_query_set.posture_queries
+  position in ziti_types_v2: 124
+                 in struct : 12
+                      size : 16
+offset of ziti_types_v2.ziti_posture_query.id
+  position in ziti_types_v2: 100
+                 in struct : 0
+                      size : 32
+offset of ziti_types_v2.ziti_address_host.type
+  position in ziti_types_v2: 148
+                 in struct : 0
+                      size : 260
+offset of ziti_types_v2.ziti_address_host.addr.hostname
+  position in ziti_types_v2: 152
+                 in struct : 4
+                      size : 260
+offset of ziti_types_v2.ziti_address_cidr.type
+  position in ziti_types_v2: 160
+                 in struct : 0
+                      size : 260
+offset of ziti_types_v2.ziti_address_cidr.addr.cidr.af
+  position in ziti_types_v2: 164
+                 in struct : 4
+                      size : 260
+offset of ziti_types_v2.ziti_address_cidr.addr.cidr.bits
+  position in ziti_types_v2: 168
+                 in struct : 8
+                      size : 260
+offset of ziti_types_v2.ziti_address_cidr.addr.cidr.ip
+  position in ziti_types_v2: 172
+                 in struct : 12
+                      size : 260
+offset of ziti_types_v2.ziti_service.id
+  position in ziti_types_v2: 136
+                 in struct : 0
+                      size : 36
+offset of ziti_types_v2.ziti_service.name
+  position in ziti_types_v2: 140
+                 in struct : 4
+                      size : 36
+offset of ziti_types_v2.ziti_service.permissions
+  position in ziti_types_v2: 144
+                 in struct : 8
+                      size : 36
+offset of ziti_types_v2.ziti_service.encryption
+  position in ziti_types_v2: 148
+                 in struct : 12
+                      size : 36
+offset of ziti_types_v2.ziti_service.perm_flags
+  position in ziti_types_v2: 152
+                 in struct : 16
+                      size : 36
+offset of ziti_types_v2.ziti_service.config
+  position in ziti_types_v2: 156
+                 in struct : 20
+                      size : 36
+offset of ziti_types_v2.ziti_service.posture_query_set
+  position in ziti_types_v2: 160
+                 in struct : 24
+                      size : 36
+offset of ziti_types_v2.ziti_service.posture_query_map
+  position in ziti_types_v2: 164
+                 in struct : 28
+                      size : 36
+offset of ziti_types_v2.ziti_service.updated_at
+  position in ziti_types_v2: 168
+                 in struct : 32
+                      size : 36
+offset of ziti_types_v2.ziti_options.disabled
+  position in ziti_types_v2: 272
+                 in struct : 4
+                      size : 56
+offset of ziti_types_v2.ziti_options.config_types
+  position in ziti_types_v2: 276
+                 in struct : 8
+                      size : 56
+offset of ziti_types_v2.ziti_options.api_page_size
+  position in ziti_types_v2: 280
+                 in struct : 12
+                      size : 56
+offset of ziti_types_v2.ziti_options.refresh_interval
+  position in ziti_types_v2: 284
+                 in struct : 16
+                      size : 56
+offset of ziti_types_v2.ziti_options.metrics_type
+  position in ziti_types_v2: 288
+                 in struct : 20
+                      size : 56
+offset of ziti_types_v2.ziti_options.router_keepalive
+  position in ziti_types_v2: 292
+                 in struct : 24
+                      size : 56
+offset of ziti_types_v2.ziti_options.app_ctx
+  position in ziti_types_v2: 312
+                 in struct : 44
+                      size : 56
+offset of ziti_types_v2.ziti_options.events
+  position in ziti_types_v2: 316
+                 in struct : 48
+                      size : 56
+offset of ziti_types_v2.ziti_context_event.type
+  position in ziti_types_v2: 280
+                 in struct : 0
+                      size : 20
+offset of ziti_types_v2.ziti_context_event.event.ctx.ctrl_status
+  position in ziti_types_v2: 284
+                 in struct : 4
+                      size : 20
+offset of ziti_types_v2.ziti_context_event.event.ctx.err
+  position in ziti_types_v2: 288
+                 in struct : 8
+                      size : 20
+offset of ziti_types_v2.ziti_router_event.type
+  position in ziti_types_v2: 292
+                 in struct : 0
+                      size : 20
+offset of ziti_types_v2.ziti_router_event.event.router.status
+  position in ziti_types_v2: 296
+                 in struct : 4
+                      size : 20
+offset of ziti_types_v2.ziti_router_event.event.router.name
+  position in ziti_types_v2: 300
+                 in struct : 8
+                      size : 20
+offset of ziti_types_v2.ziti_router_event.event.router.address
+  position in ziti_types_v2: 304
+                 in struct : 12
+                      size : 20
+offset of ziti_types_v2.ziti_router_event.event.router.version
+  position in ziti_types_v2: 308
+                 in struct : 16
+                      size : 20
+offset of ziti_types_v2.ziti_service_event.type
+  position in ziti_types_v2: 304
+                 in struct : 0
+                      size : 20
+offset of ziti_types_v2.ziti_service_event.event.service.added
+  position in ziti_types_v2: 316
+                 in struct : 12
+                      size : 20
+offset of ziti_types_v2.ziti_service_event.event.service.changed
+  position in ziti_types_v2: 312
+                 in struct : 8
+                      size : 20
+offset of ziti_types_v2.ziti_service_event.event.service.removed
+  position in ziti_types_v2: 308
+                 in struct : 4
+                      size : 20
+offset of ziti_types_v2.ziti_mfa_auth_event.type
+  position in ziti_types_v2: 316
+                 in struct : 0
+                      size : 20
+offset of ziti_types_v2.ziti_mfa_auth_event.event.mfa_auth_event.auth_query_mfa
+  position in ziti_types_v2: 320
+                 in struct : 4
+                      size : 20
+offset of ziti_types_v2.ziti_api_event.type
+  position in ziti_types_v2: 328
+                 in struct : 0
+                      size : 20
+offset of ziti_types_v2.ziti_api_event.event.api.new_ctrl_address
+  position in ziti_types_v2: 332
+                 in struct : 4
+                      size : 20
+offset of ziti_types_v2.ziti_api_event.event.api.new_ca_bundle
+  position in ziti_types_v2: 336
+                 in struct : 8
+                      size : 20
+offset output complete
+