mirror of
https://github.com/openziti/desktop-edge-win.git
synced 2026-10-14 08:39:55 +00:00
merge release-1.3.0
This commit is contained in:
dovholuknf
@@ -51,5 +51,5 @@ using System.Windows;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.2.14.0")]
|
||||
[assembly: AssemblyFileVersion("1.2.14.0")]
|
||||
[assembly: AssemblyVersion("1.3.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.3.0.0")]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<DOCUMENT Type="Advanced Installer" CreateVersion="17.4.1" version="17.5" Modules="professional" RootPath="." Language="en" Id="{7315FE7B-0418-4F38-8B12-6C0594276D30}">
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<DOCUMENT Type="Advanced Installer" CreateVersion="17.4.1" version="17.6" Modules="professional" RootPath="." Language="en" Id="{7315FE7B-0418-4F38-8B12-6C0594276D30}">
|
||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
|
||||
<ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
|
||||
<ROW Property="AI_BackgroundColor" Value="lightblue" MsiKey="AI_BackgroundColor"/>
|
||||
@@ -22,10 +22,10 @@
|
||||
<ROW Property="ARPURLINFOABOUT" Value="https://ziti.dev"/>
|
||||
<ROW Property="CTRLS" Value="2"/>
|
||||
<ROW Property="Manufacturer" Value="NetFoundry, Inc."/>
|
||||
<ROW Property="ProductCode" Value="1033:{56EED0BB-F24E-45B6-BA55-F7CE249C92AB} " Type="16"/>
|
||||
<ROW Property="ProductCode" Value="1033:{FEC3D10A-3B99-47A8-8C7C-753CD26D6377} " Type="16"/>
|
||||
<ROW Property="ProductLanguage" Value="1033"/>
|
||||
<ROW Property="ProductName" Value="Ziti Desktop Edge"/>
|
||||
<ROW Property="ProductVersion" Value="1.2.13" Type="32"/>
|
||||
<ROW Property="ProductVersion" Value="1.3.0" Type="32"/>
|
||||
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
|
||||
<ROW Property="UpgradeCode" Value="{CB7E173A-663D-4A23-BB22-D1E8D885C2F3}"/>
|
||||
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME#AnyCPU_Release:Windows 9x/ME" ValueLocId="-"/>
|
||||
|
||||
+6
-5
@@ -40,19 +40,20 @@ echo "Assembling installer using AdvancedInstaller at: $ADVINST $action $ADVPROJ
|
||||
& $ADVINST $action $ADVPROJECT
|
||||
|
||||
$gituser=$(git config user.name)
|
||||
$ghkey=$(ls github_deploy_key)
|
||||
if($gituser -eq "ziti-ci") {
|
||||
echo "yes ziti-ci"
|
||||
git add service/ziti-tunnel/version.go
|
||||
git add DesktopEdge/Properties/AssemblyInfo.cs
|
||||
git add ZitiUpdateService/Properties/AssemblyInfo.cs
|
||||
git add Installer/ZitiDesktopEdge.aip
|
||||
if(Test-Path .\github_deploy_key) {
|
||||
git commit -m "[ci skip] committing updated installer file" 2>&1
|
||||
git push
|
||||
|
||||
if(Test-Path ${scriptPath}\..\service\github_deploy_key) {
|
||||
copy $scriptPath\..\service\github_deploy_key .
|
||||
} else {
|
||||
echo "detected ziti-zi - but no gh_deploy_key so no commit and no push"
|
||||
echo "detected ziti-ci - but no gh_deploy_key. push may fail"
|
||||
}
|
||||
git commit -m "[ci skip] committing updated installer file" 2>&1
|
||||
git push 2>&1
|
||||
} else {
|
||||
echo "detected user [${gituser}] which is not ziti-ci - skipping installer commit"
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
@@ -34,3 +35,41 @@ using System.Runtime.InteropServices;
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
=======
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("ZitiUpdateService")]
|
||||
[assembly: AssemblyDescription("Ziti Monitor and Update Service")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("NetFoundry")]
|
||||
[assembly: AssemblyProduct("ZitiUpdateService")]
|
||||
[assembly: AssemblyCopyright("Copyright © NetFoundry 2020")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("9ab81609-f5dd-40a6-87b5-f3279d48514d")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.3.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.3.0.0")]
|
||||
>>>>>>> release-1.3.0
|
||||
|
||||
@@ -20,9 +20,9 @@
|
||||
package main
|
||||
|
||||
const (
|
||||
Version = "1.2.14"
|
||||
Revision = "505ce9e72030"
|
||||
Branch = "release-1.2.14"
|
||||
Version = "1.3.0"
|
||||
Revision = "9facdf76644f"
|
||||
Branch = "release-1.3.0"
|
||||
BuildUser = ""
|
||||
BuildDate = "2020-11-01 21:12:13"
|
||||
BuildDate = "2020-11-02 00:38:12"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user