diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa63257..6939d2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,13 +119,13 @@ MagMan.UI:build: - echo $CI_COMMIT_BRANCH - dotnet build $env:APP_NAME/$env:APP_NAME.csproj -MagMan.Sdk:build: +EgwProxy.MagMan:build: stage: build tags: - win variables: - APP_NAME: MagMan.Sdk - SOL_NAME: MagMan.Sdk + APP_NAME: EgwProxy.MagMan + SOL_NAME: EgwProxy.MagMan before_script: - *nuget-fix - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' @@ -136,15 +136,15 @@ MagMan.Sdk:build: # -------------------------------- # STAGING (nuget beta) # -------------------------------- -MagMan.Sdk:staging: +EgwProxy.MagMan:staging: stage: staging - needs: ["MagMan.Sdk:build"] + needs: ["EgwProxy.MagMan:build"] tags: - win variables: CONFIG: Debug - APP_NAME: MagMan.Sdk - SOL_NAME: MagMan.Sdk + APP_NAME: EgwProxy.MagMan + SOL_NAME: EgwProxy.MagMan only: refs: - develop @@ -185,15 +185,15 @@ installer: # RELEASE # -------------------------------- -MagMan.Sdk:release: +EgwProxy.MagMan:release: stage: release - needs: ["MagMan.Sdk:build"] + needs: ["EgwProxy.MagMan:build"] tags: - win variables: CONFIG: Release - APP_NAME: MagMan.Sdk - SOL_NAME: MagMan.Sdk + APP_NAME: EgwProxy.MagMan + SOL_NAME: EgwProxy.MagMan only: refs: - SDK diff --git a/MagMan.Sdk.Debug.nuspec b/EgwProxy.MagMan.Debug.nuspec similarity index 67% rename from MagMan.Sdk.Debug.nuspec rename to EgwProxy.MagMan.Debug.nuspec index 1a36155..2013a5d 100644 --- a/MagMan.Sdk.Debug.nuspec +++ b/EgwProxy.MagMan.Debug.nuspec @@ -1,24 +1,24 @@ - MagMan.Sdk + EgwProxy.MagMan #version# - MagMan.Sdk + EgwProxy.MagMan Samuele E. Locatelli, EgalWare false MIT Libreria per comunicazione REST con server MagMan online/onsite per EgtBW - beta/unstable #releaseNotes# #copyright# - MagMan.Sdk MagMan Rest + EgwProxy.MagMan MagMan Rest - - - + + + \ No newline at end of file diff --git a/MagMan.Sdk.Release.nuspec b/EgwProxy.MagMan.Release.nuspec similarity index 72% rename from MagMan.Sdk.Release.nuspec rename to EgwProxy.MagMan.Release.nuspec index 5f87abb..ef038dc 100644 --- a/MagMan.Sdk.Release.nuspec +++ b/EgwProxy.MagMan.Release.nuspec @@ -1,23 +1,23 @@ - MagMan.Sdk + EgwProxy.MagMan #version# - MagMan.Sdk + EgwProxy.MagMan Samuele E. Locatelli, EgalWare false MIT Libreria per comunicazione REST con server MagMan online/onsite per EgtBW #releaseNotes# #copyright# - MagMan.Sdk MagMan Rest + EgwProxy.MagMan MagMan Rest - - + + \ No newline at end of file diff --git a/MagMan.Sdk.sln b/EgwProxy.MagMan.sln similarity index 69% rename from MagMan.Sdk.sln rename to EgwProxy.MagMan.sln index 284ec05..96190d3 100644 --- a/MagMan.Sdk.sln +++ b/EgwProxy.MagMan.sln @@ -5,7 +5,9 @@ VisualStudioVersion = 17.8.34408.163 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestConsoleApp", "TestConsoleApp\TestConsoleApp.csproj", "{57626C9A-AAE0-4A43-A7E9-610320DD9D31}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagMan.Sdk", "MagMan.Sdk\MagMan.Sdk.csproj", "{1696D7A5-765A-4D25-8D29-CA7345023479}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwProxy.MagMan", "EgwProxy.MagMan\EgwProxy.MagMan.csproj", "{1696D7A5-765A-4D25-8D29-CA7345023479}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestWinFormVB", "TestWinFormVB\TestWinFormVB.vbproj", "{665C94F5-27A6-4CD0-9487-036D199CDC47}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,6 +23,10 @@ Global {1696D7A5-765A-4D25-8D29-CA7345023479}.Debug|Any CPU.Build.0 = Debug|Any CPU {1696D7A5-765A-4D25-8D29-CA7345023479}.Release|Any CPU.ActiveCfg = Release|Any CPU {1696D7A5-765A-4D25-8D29-CA7345023479}.Release|Any CPU.Build.0 = Release|Any CPU + {665C94F5-27A6-4CD0-9487-036D199CDC47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {665C94F5-27A6-4CD0-9487-036D199CDC47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {665C94F5-27A6-4CD0-9487-036D199CDC47}.Release|Any CPU.ActiveCfg = Release|Any CPU + {665C94F5-27A6-4CD0-9487-036D199CDC47}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TestConsoleApp/Program.cs b/TestConsoleApp/Program.cs index 83be34b..331a1ec 100644 --- a/TestConsoleApp/Program.cs +++ b/TestConsoleApp/Program.cs @@ -1,4 +1,4 @@ -using MagMan.Sdk; +using EgwProxy.MagMan; using System; using System.Collections.Generic; using System.Linq; diff --git a/TestConsoleApp/TestConsoleApp.csproj b/TestConsoleApp/TestConsoleApp.csproj index 61db970..a62ac36 100644 --- a/TestConsoleApp/TestConsoleApp.csproj +++ b/TestConsoleApp/TestConsoleApp.csproj @@ -50,9 +50,9 @@ - + {1696d7a5-765a-4d25-8d29-ca7345023479} - MagMan.Sdk + EgwProxy.MagMan diff --git a/TestWinFormVB/App.config b/TestWinFormVB/App.config new file mode 100644 index 0000000..ffaf540 --- /dev/null +++ b/TestWinFormVB/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/TestWinFormVB/Form1.Designer.vb b/TestWinFormVB/Form1.Designer.vb new file mode 100644 index 0000000..a418df0 --- /dev/null +++ b/TestWinFormVB/Form1.Designer.vb @@ -0,0 +1,31 @@ + _ +Partial Class Form1 + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + components = New System.ComponentModel.Container() + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Text = "Form1" + End Sub + +End Class diff --git a/TestWinFormVB/Form1.vb b/TestWinFormVB/Form1.vb new file mode 100644 index 0000000..17d6595 --- /dev/null +++ b/TestWinFormVB/Form1.vb @@ -0,0 +1,3 @@ +Public Class Form1 + +End Class diff --git a/TestWinFormVB/My Project/Application.Designer.vb b/TestWinFormVB/My Project/Application.Designer.vb new file mode 100644 index 0000000..e5be209 --- /dev/null +++ b/TestWinFormVB/My Project/Application.Designer.vb @@ -0,0 +1,38 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + 'NOTE: This file is auto-generated; do not modify it directly. To make changes, + ' or if you encounter build errors in this file, go to the Project Designer + ' (go to Project Properties or double-click the My Project node in + ' Solution Explorer), and make changes on the Application tab. + ' + Partial Friend Class MyApplication + + _ + Public Sub New() + MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) + Me.IsSingleInstance = false + Me.EnableVisualStyles = true + Me.SaveMySettingsOnExit = true + Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses + End Sub + + _ + Protected Overrides Sub OnCreateMainForm() + Me.MainForm = Global.TestWinFormVB.Form1 + End Sub + End Class +End Namespace diff --git a/TestWinFormVB/My Project/Application.myapp b/TestWinFormVB/My Project/Application.myapp new file mode 100644 index 0000000..1243847 --- /dev/null +++ b/TestWinFormVB/My Project/Application.myapp @@ -0,0 +1,11 @@ + + + true + Form1 + false + 0 + true + 0 + 0 + true + diff --git a/TestWinFormVB/My Project/AssemblyInfo.vb b/TestWinFormVB/My Project/AssemblyInfo.vb new file mode 100644 index 0000000..e3685b0 --- /dev/null +++ b/TestWinFormVB/My Project/AssemblyInfo.vb @@ -0,0 +1,35 @@ +Imports System +Imports System.Reflection +Imports 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. + +' Review the values of the assembly attributes + + + + + + + + + + +'The following GUID is for the ID of the typelib if this project is exposed to COM + + +' 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: +' + + + diff --git a/TestWinFormVB/My Project/Resources.Designer.vb b/TestWinFormVB/My Project/Resources.Designer.vb new file mode 100644 index 0000000..c8f09e2 --- /dev/null +++ b/TestWinFormVB/My Project/Resources.Designer.vb @@ -0,0 +1,62 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My.Resources + + 'This class was auto-generated by the StronglyTypedResourceBuilder + 'class via a tool like ResGen or Visual Studio. + 'To add or remove a member, edit your .ResX file then rerun ResGen + 'with the /str option, or rebuild your VS project. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("TestWinFormVB.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set(ByVal value As Global.System.Globalization.CultureInfo) + resourceCulture = value + End Set + End Property + End Module +End Namespace diff --git a/TestWinFormVB/My Project/Resources.resx b/TestWinFormVB/My Project/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/TestWinFormVB/My Project/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TestWinFormVB/My Project/Settings.Designer.vb b/TestWinFormVB/My Project/Settings.Designer.vb new file mode 100644 index 0000000..12bb240 --- /dev/null +++ b/TestWinFormVB/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' This code was generated by a tool. +' Runtime Version:4.0.30319.42000 +' +' Changes to this file may cause incorrect behavior and will be lost if +' the code is regenerated. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + _ + Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) + +#Region "My.Settings Auto-Save Functionality" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As MySettings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If + Return defaultInstance + End Get + End Property + End Class +End Namespace + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.TestWinFormVB.My.MySettings + Get + Return Global.TestWinFormVB.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/TestWinFormVB/My Project/Settings.settings b/TestWinFormVB/My Project/Settings.settings new file mode 100644 index 0000000..85b890b --- /dev/null +++ b/TestWinFormVB/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/TestWinFormVB/TestWinFormVB.vbproj b/TestWinFormVB/TestWinFormVB.vbproj new file mode 100644 index 0000000..c989c2c --- /dev/null +++ b/TestWinFormVB/TestWinFormVB.vbproj @@ -0,0 +1,120 @@ + + + + + Debug + AnyCPU + {665C94F5-27A6-4CD0-9487-036D199CDC47} + WinExe + TestWinFormVB.My.MyApplication + TestWinFormVB + TestWinFormVB + 512 + WindowsForms + v4.7.2 + true + true + + + AnyCPU + true + full + true + true + bin\Debug\ + TestWinFormVB.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + TestWinFormVB.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + Form1.vb + Form + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + \ No newline at end of file