Merge pull request #198 from tannergooding/main

Updating version to RC1 and add support for release binaries
terrafx · Oct 6, 2021 · 656f51d · 656f51d
2 parents 8a0c237 + c4eeeb0
commit 656f51d
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -87,17 +87,36 @@ jobs:
           ./artifacts/pkg/**/*
           ./artifacts/tst/**/*
         if-no-files-found: error
-  build-nuget:
+  build-nuget-preview:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
     - run: ./scripts/cibuild.cmd -configuration release -architecture x64
       shell: cmd
       env:
         EXCLUDE_RUN_ID_FROM_PACKAGE: true
+        EXCLUDE_SUFFIX_FROM_VERSION: false
     - uses: actions/upload-artifact@v2
       with:
-        name: nuget
+        name: nuget_preview
+        path: |
+          ./artifacts/bin/**/*
+          ./artifacts/log/**/*
+          ./artifacts/pkg/**/*
+          ./artifacts/tst/**/*
+        if-no-files-found: error
+  build-nuget-release:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: ./scripts/cibuild.cmd -configuration release -architecture x64
+      shell: cmd
+      env:
+        EXCLUDE_RUN_ID_FROM_PACKAGE: true
+        EXCLUDE_SUFFIX_FROM_VERSION: true
+    - uses: actions/upload-artifact@v2
+      with:
+        name: nuget_release
         path: |
           ./artifacts/bin/**/*
           ./artifacts/log/**/*
@@ -107,7 +126,7 @@ jobs:
   publish-nightlies-azure:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'push' }}
-    needs: [ windows-x64, windows-x86, linux-x64, macos-x64, build-nuget ]
+    needs: [ windows-x64, windows-x86, linux-x64, macos-x64, build-nuget-preview, build-nuget-release ]
     steps:
     - uses: actions/download-artifact@v2
       with:
@@ -119,11 +138,11 @@ jobs:
         source-url: https://pkgs.terrafx.dev/index.json
       env:
         NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_PAT }}
-    - run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --api-key AzureDevOps
+    - run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --api-key AzureDevOps --skip-duplicate
   publish-nightlies-github:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'push' }}
-    needs: [ windows-x64, windows-x86, linux-x64, macos-x64, build-nuget ]
+    needs: [ windows-x64, windows-x86, linux-x64, macos-x64, build-nuget-preview, build-nuget-release ]
     steps:
     - uses: actions/download-artifact@v2
       with:
@@ -132,4 +151,4 @@ jobs:
     - uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '5.0.x'
-    - run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --source https://nuget.pkg.github.com/terrafx/index.json --api-key ${{ secrets.GITHUB_TOKEN }}
+    - run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --source https://nuget.pkg.github.com/terrafx/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -42,8 +42,8 @@
     <ContinuousIntegrationBuild Condition="'$(GITHUB_RUN_ID)' != ''">true</ContinuousIntegrationBuild>
     <PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
     <Product>TerraFX.Interop.Windows</Product>
-    <VersionPrefix>10.0.20348</VersionPrefix>
-    <VersionSuffix>beta1</VersionSuffix>
+    <VersionPrefix>10.0.20348.0</VersionPrefix>
+    <VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc1</VersionSuffix>
     <VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
   </PropertyGroup>
 

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -18,7 +18,7 @@
 
   <!-- Settings that are only set for CI builds -->
   <PropertyGroup Condition="'$(GITHUB_RUN_ID)' != ''">
-    <PackageVersion Condition="'$(EXCLUDE_RUN_ID_FROM_PACKAGE)' == ''">$(Version)-$(GITHUB_RUN_ID)</PackageVersion>
+    <PackageVersion Condition="'$(EXCLUDE_RUN_ID_FROM_PACKAGE)' != 'true'">$(Version)-$(GITHUB_RUN_ID)</PackageVersion>
   </PropertyGroup>
 
   <!-- Settings that are only set for executables -->

diff --git a/generation/remap.rsp b/generation/remap.rsp
@@ -3704,11 +3704,13 @@ __AnonymousBase_dwrite_1_L627_C38=Base
 __AnonymousBase_dwrite_2_L67_C31=Base
 __AnonymousBase_dwrite_3_L1623_C31=Base
 __AnonymousBase_dwrite_3_L1802_C34=Base
-__AnonymousBase_ObjIdl_L8451_C36=Base
-__AnonymousBase_ObjIdl_L8475_C36=Base
+__AnonymousBase_objidl_L8984_C36=Base
+__AnonymousBase_objidl_L9008_C36=Base
+__AnonymousBase_sapi_L5880_C34=Base
+__AnonymousBase_sapi_L5848_C37=Base
 __AnonymousBase_WinUser_L1166_C46=Base
-__AnonymousBase_WinUser_L13548_C43=Base
-__AnonymousBase_WinUser_L13552_C43=Base
+__AnonymousBase_WinUser_L13549_C43=Base
+__AnonymousBase_WinUser_L13553_C43=Base
 __AnonymousEnum_d2d1_L89_C1=D2D1_INTERPOLATION_MODE_DEFINITION
 __MFAYUVSample=MFAYUVSample
 __MIDL_IAdviseSink_0002=_u_e__Union

diff --git a/sources/Interop/Windows/um/WinUser/MONITORINFOEXA.cs b/sources/Interop/Windows/um/WinUser/MONITORINFOEXA.cs
@@ -9,7 +9,7 @@ namespace TerraFX.Interop
     [NativeInheritance("tagMONITORINFO")]
     public unsafe partial struct MONITORINFOEXA
     {
-        public MONITORINFO __AnonymousBase_WinUser_L13549_C43;
+        public MONITORINFO Base;
 
         [NativeTypeName("CHAR [32]")]
         public fixed sbyte szDevice[32];

diff --git a/sources/Interop/Windows/um/WinUser/MONITORINFOEXW.cs b/sources/Interop/Windows/um/WinUser/MONITORINFOEXW.cs
@@ -9,7 +9,7 @@ namespace TerraFX.Interop
     [NativeInheritance("tagMONITORINFO")]
     public unsafe partial struct MONITORINFOEXW
     {
-        public MONITORINFO __AnonymousBase_WinUser_L13553_C43;
+        public MONITORINFO Base;
 
         [NativeTypeName("WCHAR [32]")]
         public fixed ushort szDevice[32];

diff --git a/sources/Interop/Windows/um/objidl/BIND_OPTS2.cs b/sources/Interop/Windows/um/objidl/BIND_OPTS2.cs
@@ -9,7 +9,7 @@ namespace TerraFX.Interop
     [NativeInheritance("tagBIND_OPTS")]
     public unsafe partial struct BIND_OPTS2
     {
-        public BIND_OPTS __AnonymousBase_objidl_L8984_C36;
+        public BIND_OPTS Base;
 
         [NativeTypeName("DWORD")]
         public uint dwTrackFlags;

diff --git a/sources/Interop/Windows/um/objidl/BIND_OPTS3.cs b/sources/Interop/Windows/um/objidl/BIND_OPTS3.cs
@@ -11,7 +11,7 @@ namespace TerraFX.Interop
     [NativeInheritance("tagBIND_OPTS2")]
     public partial struct BIND_OPTS3
     {
-        public BIND_OPTS2 __AnonymousBase_objidl_L9008_C36;
+        public BIND_OPTS2 Base;
 
         [NativeTypeName("HWND")]
         public IntPtr hwnd;

diff --git a/sources/Interop/Windows/um/sapi/SPPHRASE.cs b/sources/Interop/Windows/um/sapi/SPPHRASE.cs
@@ -9,7 +9,7 @@ namespace TerraFX.Interop
     [NativeInheritance("SPPHRASE_53")]
     public partial struct SPPHRASE
     {
-        public SPPHRASE_53 __AnonymousBase_sapi_L5880_C34;
+        public SPPHRASE_53 Base;
 
         public SPSEMANTICFORMAT SemanticTagFormat;
     }

diff --git a/sources/Interop/Windows/um/sapi/SPPHRASE_53.cs b/sources/Interop/Windows/um/sapi/SPPHRASE_53.cs
@@ -9,7 +9,7 @@ namespace TerraFX.Interop
     [NativeInheritance("SPPHRASE_50")]
     public unsafe partial struct SPPHRASE_53
     {
-        public SPPHRASE_50 __AnonymousBase_sapi_L5848_C37;
+        public SPPHRASE_50 Base;
 
         [NativeTypeName("LPWSTR")]
         public ushort* pSML;