Merge pull request #744 from openziti/release-2.4.x

Release 2.4.x
openziti · Oct 23, 2024 · 0636838 · 0636838
2 parents 46608d5 + 3f0dd56
commit 0636838
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 21 deletions.
diff --git a/AWSSigner.NET/AWSSigner.NET.csproj b/AWSSigner.NET/AWSSigner.NET.csproj
@@ -37,13 +37,13 @@
       <HintPath>..\packages\AWS.EncryptionSDK.3.1.0\lib\net452\AWS.EncryptionSDK.dll</HintPath>
     </Reference>
     <Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
-      <HintPath>..\packages\AWSSDK.Core.3.7.400.36\lib\net45\AWSSDK.Core.dll</HintPath>
+      <HintPath>..\packages\AWSSDK.Core.3.7.400.37\lib\net45\AWSSDK.Core.dll</HintPath>
     </Reference>
     <Reference Include="AWSSDK.KeyManagementService, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
-      <HintPath>..\packages\AWSSDK.KeyManagementService.3.7.400.36\lib\net45\AWSSDK.KeyManagementService.dll</HintPath>
+      <HintPath>..\packages\AWSSDK.KeyManagementService.3.7.400.37\lib\net45\AWSSDK.KeyManagementService.dll</HintPath>
     </Reference>
     <Reference Include="AWSSDK.SecretsManager, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
-      <HintPath>..\packages\AWSSDK.SecretsManager.3.7.400.36\lib\net45\AWSSDK.SecretsManager.dll</HintPath>
+      <HintPath>..\packages\AWSSDK.SecretsManager.3.7.400.37\lib\net45\AWSSDK.SecretsManager.dll</HintPath>
     </Reference>
     <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
@@ -144,10 +144,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\AWSSDK.KeyManagementService.3.7.400.36\analyzers\dotnet\cs\AWSSDK.KeyManagementService.CodeAnalysis.dll" />
-    <Analyzer Include="..\packages\AWSSDK.KeyManagementService.3.7.400.36\analyzers\dotnet\cs\SharedAnalysisCode.dll" />
-    <Analyzer Include="..\packages\AWSSDK.SecretsManager.3.7.400.36\analyzers\dotnet\cs\AWSSDK.SecretsManager.CodeAnalysis.dll" />
-    <Analyzer Include="..\packages\AWSSDK.SecretsManager.3.7.400.36\analyzers\dotnet\cs\SharedAnalysisCode.dll" />
+    <Analyzer Include="..\packages\AWSSDK.KeyManagementService.3.7.400.37\analyzers\dotnet\cs\AWSSDK.KeyManagementService.CodeAnalysis.dll" />
+    <Analyzer Include="..\packages\AWSSDK.KeyManagementService.3.7.400.37\analyzers\dotnet\cs\SharedAnalysisCode.dll" />
+    <Analyzer Include="..\packages\AWSSDK.SecretsManager.3.7.400.37\analyzers\dotnet\cs\AWSSDK.SecretsManager.CodeAnalysis.dll" />
+    <Analyzer Include="..\packages\AWSSDK.SecretsManager.3.7.400.37\analyzers\dotnet\cs\SharedAnalysisCode.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/AWSSigner.NET/packages.config b/AWSSigner.NET/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AWS.EncryptionSDK" version="3.1.0" targetFramework="net472" />
-  <package id="AWSSDK.Core" version="3.7.400.36" targetFramework="net472" />
-  <package id="AWSSDK.KeyManagementService" version="3.7.400.36" targetFramework="net472" />
-  <package id="AWSSDK.SecretsManager" version="3.7.400.36" targetFramework="net472" />
+  <package id="AWSSDK.Core" version="3.7.400.37" targetFramework="net472" />
+  <package id="AWSSDK.KeyManagementService" version="3.7.400.37" targetFramework="net472" />
+  <package id="AWSSDK.SecretsManager" version="3.7.400.37" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Configuration" version="8.0.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Configuration.Abstractions" version="8.0.0" targetFramework="net472" />
@@ -29,4 +29,4 @@
   <package id="System.Text.Json" version="8.0.5" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
-</packages>
+</packages>
diff --git a/Installer/build.ps1 b/Installer/build.ps1
@@ -28,7 +28,7 @@ $ADV_INST_HOME = "C:\Program Files (x86)\Caphyon\Advanced Installer ${ADV_INST_V
 $SIGNTOOL="${ADV_INST_HOME}\third-party\winsdk\x64\signtool.exe"
 $ADVINST = "${ADV_INST_HOME}\bin\x86\AdvancedInstaller.com"
 $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip"
-$ZITI_EDGE_TUNNEL_VERSION="v1.2.3"
+$ZITI_EDGE_TUNNEL_VERSION="v1.2.4"
 
 echo "Cleaning previous build folder if it exists"
 Remove-Item "${buildPath}" -r -ErrorAction Ignore

diff --git a/release-notes.md b/release-notes.md
@@ -1,3 +1,20 @@
+# Release 2.5.0.14
+
+## What's New
+* nothing yet
+
+## Other changes
+* none
+
+## Bugs fixed:
+* none
+
+## Dependency Updates
+
+* ziti-tunneler: v1.2.4
+* ziti-sdk:      1.1.4
+* tlsuv:         v0.32.6[OpenSSL 3.3.1 4 Jun 2024]
+
 # Release 2.5.0.13
 
 ## What's New
@@ -11,8 +28,8 @@
 
 ## Dependency Updates
 
-* ziti-tunneler: v1.2.2
-* ziti-sdk:      1.1.2
+* ziti-tunneler: v1.2.3
+* ziti-sdk:      1.1.3
 * tlsuv:         v0.32.6[OpenSSL 3.3.1 4 Jun 2024]
 
 # Release 2.5.0.12

diff --git a/release-streams/beta.json b/release-streams/beta.json
@@ -1,12 +1,12 @@
 {
-  "name": "2.5.0.13",
-  "tag_name": "2.5.0.13",
-  "published_at": "2024-10-21T11:03:27Z",
+  "name": "2.5.0.14",
+  "tag_name": "2.5.0.14",
+  "published_at": "2024-10-22T13:16:26Z",
   "installation_critical": false,
   "assets": [
     {
-      "name": "Ziti.Desktop.Edge.Client-2.5.0.13.exe",
-      "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.0.13/Ziti.Desktop.Edge.Client-2.5.0.13.exe"
+      "name": "Ziti.Desktop.Edge.Client-2.5.0.14.exe",
+      "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.0.14/Ziti.Desktop.Edge.Client-2.5.0.14.exe"
     }
   ]
 }
diff --git a/release-streams/beta.json.new b/release-streams/beta.json.new
@@ -0,0 +1,12 @@
+{
+  "name": "2.5.0.13",
+  "tag_name": "2.5.0.13",
+  "published_at": "2024-10-18T08:32:49Z",
+  "installation_critical": false,
+  "assets": [
+    {
+      "name": "Ziti.Desktop.Edge.Client-2.5.0.13.exe",
+      "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.0.13/Ziti.Desktop.Edge.Client-2.5.0.13.exe"
+    }
+  ]
+}
diff --git a/version b/version
@@ -1 +1 @@
-2.5.0.13
+2.5.0.14