Fixes

zeroc-ice · Feb 13, 2025 · cf5b9e7 · cf5b9e7
1 parent 05df60c
commit cf5b9e7
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 15 deletions.
diff --git a/.github/actions/setup-dependencies/action.yml b/.github/actions/setup-dependencies/action.yml
@@ -31,6 +31,7 @@ runs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: "3.3"
+      if: runner.os != 'Windows'
 
     - uses: actions/setup-node@v4
       with:

diff --git a/.github/workflows/build-msi-package.yml b/.github/workflows/build-msi-package.yml
@@ -25,6 +25,8 @@ jobs:
       - name: Build MSI
         run: dotnet build -c Release -p:Platform=x64
         working-directory: packaging/msi
+        env:
+          VCInstallDir: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC"
 
       - name: Upload NuGet Packages
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/build-nightly-release-workflow.yml b/.github/workflows/build-nightly-release-workflow.yml
@@ -44,8 +44,8 @@ jobs:
           echo "nuget_version=${VERSION}-nightly.${DATE}.${BUILD}" >> $GITHUB_OUTPUT
           # - PyPI: 3.8.0.devYYYYMMDD.BUILD
           echo "pypi_version=${VERSION}.dev${DATE}.${BUILD}" >> $GITHUB_OUTPUT
-          # - RPM: 3.8.0-0.nightlyYYYYMMDD.BUILD
-          echo "rpm_version=${VERSION}-0.nightly${DATE}.${BUILD}" >> $GITHUB_OUTPUT
+          # - RPM: 3.8.0~0.nightlyYYYYMMDD.BUILD
+          echo "rpm_version=${VERSION}~0.nightly${DATE}.${BUILD}" >> $GITHUB_OUTPUT
 
   build-deb-packages:
     name: Build DEB Packages

diff --git a/.github/workflows/build-npm-packages.yml b/.github/workflows/build-npm-packages.yml
@@ -104,6 +104,7 @@ jobs:
         working-directory: ice/js
 
       - name: Update Version
+        working-directory: ice/js
         run: |
           sed -i 's/"version":.*/"version": "${{ inputs.ice_version }}"/' package.json
         if: inputs.ice_version != ''
@@ -119,10 +120,11 @@ jobs:
           path: ice/js/*.tgz
 
       - name: Publish NPM Packages
+        working-directory: ice/js
         run: |
           echo "//${{ inputs.registry_url }}/:_auth=\${NPM_AUTH_TOKEN}" > ~/.npmrc
           echo "always-auth=true" >> ~/.npmrc
-          npm publish ice/js/*.tgz --registry ${{ inputs.registry_url }}
+          npm publish *.tgz --registry ${{ inputs.registry_url }}
         env:
           NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
         if: inputs.registry_url != ''
diff --git a/.github/workflows/build-pip-packages.yml b/.github/workflows/build-pip-packages.yml
@@ -45,10 +45,11 @@ jobs:
         run: |
           python3 -m pip install --upgrade pip
           python3 -m pip install build
+          python3 -m pip install toml
 
       - name: Update PYPI Version
         working-directory: python
-        run: sed -i 's/version = .*/version = "${{ inputs.ice_version }}"/' pyproject.toml
+        run: python3 packaging/pypi/update_version.py ${{ inputs.ice_version }} python/pyproject.toml
         if: inputs.ice_version != ''
 
       - name: Build PIP Package

diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj
@@ -8,6 +8,9 @@
     </PropertyGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)\..\..\config\icebuilder.props" />
+    <PropertyGroup>
+        <PackageVersion Condition="'$(PackageVersion)' = ''">$(IceJSONVersion)</PackageVersion>
+    </PropertyGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)\..\..\config\ice.common.targets" />
 
@@ -20,7 +23,21 @@
         <!-- .NET projects to build with dist target -->
         <DistProjects Include="../src/**/*.csproj">
           <Properties>Configuration=$(Configuration);Platform=Any CPU;CppPlatform=$(CppPlatform)</Properties>
+          <Properties Condition="'$(Version)' != ''">Version=$(Version)</Properties>
+          <Properties Condition="'$(PackageVersion)' != ''">PackageVersion=$(PackageVersion)</Properties>
         </DistProjects>
+
+        <!-- .NET projects to pack -->
+        <IceBoxNetProject Include="$(MSBuildThisFileDirectory)..\src\IceBoxNet\IceBoxNet.csproj">
+          <Properties>Configuration=$(Configuration);Platform=Any CPU;AppTargetFramework=net8.0</Properties>
+          <Properties Condition="'$(Version)' != ''">Version=$(Version)</Properties>
+          <Properties Condition="'$(PackageVersion)' != ''">PackageVersion=$(PackageVersion)</Properties>
+        </IceBoxNetProject>
+        <PackProject Include="zeroc.ice.net.csproj">
+          <Properties>Configuration=$(Configuration);Platform=Any CPU;CppPlatform=$(CppPlatform)</Properties>
+          <Properties Condition="'$(Version)' != ''">Version=$(Version)</Properties>
+          <Properties Condition="'$(PackageVersion)' != ''">PackageVersion=$(PackageVersion)</Properties>
+        </PackProject>
     </ItemGroup>
 
     <Target Name="NuGetRestore">
@@ -51,10 +68,8 @@
 
     <Target Name="Pack" DependsOnTargets="BuildDist">
         <RemoveDir Directories="zeroc.ice.net" />
-        <MSBuild Projects="$(MSBuildThisFileDirectory)..\src\IceBoxNet\IceBoxNet.csproj"
-                 Properties="Configuration=$(Configuration);Platform=Any CPU;AppTargetFramework=net8.0"
-                 Targets="Restore;Publish" />
-        <MSBuild Projects="zeroc.ice.net.csproj" Targets="Restore;Pack"/>
+        <MSBuild Projects="@(IceBoxNetProject)" Properties="%(Properties)" Targets="Restore;Publish" />
+        <MSBuild Projects="@(PackProject)" Properties="%(Properties)" Targets="Restore;Pack"/>
         <RemoveDir Directories="obj"/>
         <Delete Files="zeroc.ice.net\zeroc.ice.net.deps.json;zeroc.ice.net\zeroc.ice.net.dll;zeroc.ice.net\zeroc.ice.net.pdb"/>
     </Target>
@@ -68,8 +83,8 @@
             <NuGetGlobalPackages>$(NuGetGlobalPackages.TrimStart('global-packages: '))</NuGetGlobalPackages>
         </PropertyGroup>
 
-        <RemoveDir Directories="$(NuGetGlobalPackages)\zeroc.ice.net\$(IceJSONVersion)"
-            Condition="Exists('$(NuGetGlobalPackages)\zeroc.ice.net\$(IceJSONVersion)')"/>
-        <Exec Command="dotnet nuget push $(MSBuildThisFileDirectory)zeroc.ice.net\zeroc.ice.net.$(IceJSONVersion).nupkg --source $(NuGetGlobalPackages)" />
+        <RemoveDir Directories="$(NuGetGlobalPackages)\zeroc.ice.net\$(PackageVersion)"
+            Condition="Exists('$(NuGetGlobalPackages)\zeroc.ice.net\$(PackageVersion)')"/>
+        <Exec Command="dotnet nuget push $(MSBuildThisFileDirectory)zeroc.ice.net\zeroc.ice.net.$(PackageVersion).nupkg --source $(NuGetGlobalPackages)" />
     </Target>
 </Project>
diff --git a/packaging/msi/Ice.wixproj b/packaging/msi/Ice.wixproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
       <BindPath Include="$(MBuildThisFileDirectory)..\..\" BindName="SOURCE_ROOT" />
+      <BindPath Include="$(VCInstallDir)\Redist\MSVC\v143\MergeModules\" BindName="MERGE_MODULES" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/packaging/msi/Product.wxs b/packaging/msi/Product.wxs
@@ -37,8 +37,8 @@
 
          <!-- VC140 C++ runtime merge module -->
         <StandardDirectory Id="TARGETDIR">
-            <Merge Id="VC140CRT"
-                SourceFile="$(env.CommonProgramFiles(x86))\Merge Modules\Microsoft_VC140_CRT_x64.msm"
+            <Merge Id="VC143CRT"
+                SourceFile="!(bindpath.MERGE_MODULES)\Microsoft_VC143_CRT_x64.msm"
                 Language="0"/>
         </StandardDirectory>
 
@@ -113,7 +113,7 @@
         <Feature Id="MainFeature" Title="Ice" Level="1">
             <ComponentGroupRef Id="ProductComponents" />
             <ComponentGroupRef Id="StartMenuComponents"/>
-            <MergeRef Id="VC140CRT"/>
+            <MergeRef Id="VC143CRT"/>
         </Feature>
     </Package>
 </Wix>
diff --git a/packaging/rpm/ice.spec b/packaging/rpm/ice.spec
@@ -36,8 +36,8 @@
 
 Name: %{?nameprefix}ice
 Version: 3.8.0~alpha0
-Summary: Comprehensive RPC framework with support for C++, Java, JavaScript, Python and more.
 Release: 1%{?dist}
+Summary: Comprehensive RPC framework with support for C++, Java, JavaScript, Python and more.
 %if "%{?ice_license}"
 License: %{ice_license}
 %else