Merge 09682fcc776a141500f11d797bed7d6c57a12633 into 4658192547e9b36baeaf90511e14d9bcd80a0402

2025-03-14 04:54:49 +00:00 · 2024-11-14 00:27:46 +00:00 · 2024-11-14 00:27:46 +00:00 · e14258508c
commit e14258508c
parent 4658192547 09682fcc77
14 changed files with 40 additions and 13 deletions
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -0,0 +1,27 @@
+name: Windows
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+  push:
+    branches: [master, v1.10]
+jobs:
+  x64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Build
+      run: msbuild Freeswitch.2017.sln -t:build -verbosity:minimal -property:Configuration=Release -property:Platform=x64
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: MSI Package
+        path: D:\a\freeswitch\freeswitch\x64\*.msi
--- a/libs/esl/managed/esl.2017.vcxproj
+++ b/libs/esl/managed/esl.2017.vcxproj
@ -23,7 +23,7 @@
    <ProjectGuid>{FEA2D0AE-6713-4E41-A473-A143849BC7FF}</ProjectGuid>
    <RootNamespace>ESL</RootNamespace>
    <Keyword>ManagedCProj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
--- a/libs/win32/civetweb/duktape_lib.vcxproj
+++ b/libs/win32/civetweb/duktape_lib.vcxproj
@ -22,7 +22,7 @@
    <ProjectGuid>{0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>duktape_lib</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/libs/win32/civetweb/lua_lib.vcxproj
+++ b/libs/win32/civetweb/lua_lib.vcxproj
@ -22,7 +22,7 @@
    <ProjectGuid>{8F5E5D77-D269-4665-9E27-1045DA6CF0D8}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>lua_lib</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/libs/win32/ffmpeg/ffmpeg.2017.vcxproj
+++ b/libs/win32/ffmpeg/ffmpeg.2017.vcxproj
@ -21,7 +21,7 @@
  <PropertyGroup Label="Globals">
    <ProjectName>ffmpeg</ProjectName>
    <RootNamespace>ffmpeg</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    <ProjectGuid>{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(SolutionDir)w32\zlib.props" Condition=" '$(zlibImported)' == '' " />
--- a/libs/win32/libav/libav.2017.vcxproj
+++ b/libs/win32/libav/libav.2017.vcxproj
@ -21,7 +21,7 @@
  <PropertyGroup Label="Globals">
    <ProjectName>libav</ProjectName>
    <RootNamespace>libav</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    <ProjectGuid>{841C345F-FCC7-4F64-8F54-0281CEABEB01}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(SolutionDir)\w32\yasm.props" Condition=" '$(YasmPropsImported)' == '' " />
--- a/libs/win32/libyuv/libyuv.2017.vcxproj
+++ b/libs/win32/libyuv/libyuv.2017.vcxproj
@ -23,7 +23,7 @@
    <ProjectGuid>{B6E22500-3DB6-4E6E-8CD5-591B781D7D99}</ProjectGuid>
    <RootNamespace>libyuv</RootNamespace>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
--- a/libs/win32/speex/libspeexdsp.2017.vcxproj
+++ b/libs/win32/speex/libspeexdsp.2017.vcxproj
@ -38,7 +38,7 @@
    <ProjectGuid>{03207781-0D1C-4DB3-A71D-45C608F28DBD}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <ProjectName>libspeexdsp</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(SolutionDir)\w32\download_speex.props" Condition=" '$(downloadspeexPropsImported)' == '' " />
--- a/src/mod/applications/mod_av/test/test_mod_av.2017.vcxproj
+++ b/src/mod/applications/mod_av/test/test_mod_av.2017.vcxproj
@ -22,7 +22,7 @@
    <ProjectName>test_mod_av</ProjectName>
    <RootNamespace>test_mod_av</RootNamespace>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    <ProjectGuid>{7926CB0D-62CE-4A09-AE94-1DA2BC92D625}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--- a/tests/unit/test_switch_core.2017.vcxproj
+++ b/tests/unit/test_switch_core.2017.vcxproj
@ -22,7 +22,7 @@
    <ProjectName>test_switch_core</ProjectName>
    <RootNamespace>test_switch_core</RootNamespace>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    <ProjectGuid>{EF62B845-A0CE-44FD-B8E6-475FE87D06C3}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--- a/tests/unit/test_switch_core_codec.2017.vcxproj
+++ b/tests/unit/test_switch_core_codec.2017.vcxproj
@ -22,7 +22,7 @@
    <ProjectName>test_switch_core_codec</ProjectName>
    <RootNamespace>test_switch_core_codec</RootNamespace>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    <ProjectGuid>{589A07E7-5DE5-49FD-A62C-27795B806AFB}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--- a/tests/unit/test_switch_core_db.2017.vcxproj
+++ b/tests/unit/test_switch_core_db.2017.vcxproj
@ -22,7 +22,7 @@
    <ProjectName>test_switch_core_db</ProjectName>
    <RootNamespace>test_switch_core_db</RootNamespace>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    <ProjectGuid>{580675D7-C1C9-4197-AAC5-00F64FAFDE78}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--- a/tests/unit/test_switch_ivr_originate.2017.vcxproj
+++ b/tests/unit/test_switch_ivr_originate.2017.vcxproj
@ -22,7 +22,7 @@
    <ProjectName>test_switch_ivr_originate</ProjectName>
    <RootNamespace>test_switch_ivr_originate</RootNamespace>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    <ProjectGuid>{69A7464A-9B0D-4804-A108-835229DACF58}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
--- a/w32/Library/FreeSwitchCore.2017.vcxproj
+++ b/w32/Library/FreeSwitchCore.2017.vcxproj
@ -23,7 +23,7 @@
    <ProjectGuid>{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}</ProjectGuid>
    <RootNamespace>FreeSwitchCoreLib</RootNamespace>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">