diff --git a/CatalogLib/CatalogLib.csproj b/CatalogLib/CatalogLib.csproj index 8657ce6..c88f86e 100644 --- a/CatalogLib/CatalogLib.csproj +++ b/CatalogLib/CatalogLib.csproj @@ -53,12 +53,6 @@ MinimumRecommendedRules.ruleset - - ..\packages\ImageSharp.1.0.0-alpha9-00169\lib\netstandard1.3\ImageSharp.dll - - - ..\packages\ImageSharp.Drawing.1.0.0-alpha9-00164\lib\netstandard1.1\ImageSharp.Drawing.dll - ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll diff --git a/imagecatalog/FodyWeavers.xml b/imagecatalog/FodyWeavers.xml new file mode 100644 index 0000000..a5dcf04 --- /dev/null +++ b/imagecatalog/FodyWeavers.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/imagecatalog/FodyWeavers.xsd b/imagecatalog/FodyWeavers.xsd new file mode 100644 index 0000000..44a5374 --- /dev/null +++ b/imagecatalog/FodyWeavers.xsd @@ -0,0 +1,111 @@ + + + + + + + + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with line breaks. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with line breaks. + + + + + The order of preloaded assemblies, delimited with line breaks. + + + + + + This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. + + + + + Controls if .pdbs for reference assemblies are also embedded. + + + + + Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. + + + + + As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. + + + + + Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. + + + + + Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with |. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with |. + + + + + The order of preloaded assemblies, delimited with |. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/imagecatalog/ImageCatalog 2.vbproj b/imagecatalog/ImageCatalog 2.vbproj index b0ec20d..172cbc4 100644 --- a/imagecatalog/ImageCatalog 2.vbproj +++ b/imagecatalog/ImageCatalog 2.vbproj @@ -1,5 +1,5 @@  - + Local 9.0.30729 @@ -31,10 +31,15 @@ 3.5 - v4.0 + v4.7.2 true My Project\app.manifest - Client + + + SAK + SAK + SAK + SAK http://localhost/ImageCatalog/ true Web @@ -49,10 +54,8 @@ 1.8.0.%2a false true - SAK - SAK - SAK - SAK + + bin\ @@ -74,6 +77,7 @@ full AnyCPU AllRules.ruleset + false bin\ @@ -95,6 +99,7 @@ none AnyCPU AllRules.ruleset + false true @@ -108,6 +113,7 @@ full x64 AllRules.ruleset + false true @@ -119,6 +125,7 @@ 42016,42017,42018,42019,42032,42353,42354,42355 x64 AllRules.ruleset + false true @@ -140,6 +147,7 @@ ;F:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules true false + false true @@ -158,6 +166,7 @@ true ;F:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules true + false diff --git a/imagecatalog/MainForm.Designer.vb b/imagecatalog/MainForm.Designer.vb index 268e131..42cef0f 100644 --- a/imagecatalog/MainForm.Designer.vb +++ b/imagecatalog/MainForm.Designer.vb @@ -299,7 +299,7 @@ Partial Class MainForm Me.TextBox8.Name = "TextBox8" Me.TextBox8.Size = New System.Drawing.Size(47, 20) Me.TextBox8.TabIndex = 2 - Me.TextBox8.Text = "5" + Me.TextBox8.Text = "4" ' 'Label7 ' @@ -316,7 +316,7 @@ Partial Class MainForm Me.TextBox7.Name = "TextBox7" Me.TextBox7.Size = New System.Drawing.Size(47, 20) Me.TextBox7.TabIndex = 0 - Me.TextBox7.Text = "15" + Me.TextBox7.Text = "4" ' 'GroupBox3 ' @@ -1493,7 +1493,7 @@ Partial Class MainForm Me.Label27.Name = "Label27" Me.Label27.Size = New System.Drawing.Size(140, 20) Me.Label27.TabIndex = 62 - Me.Label27.Text = "Versione 2.0 BETA 5" + Me.Label27.Text = "Versione 2.1 2019" Me.Label27.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' 'Button7 diff --git a/imagecatalog/MainForm.vb b/imagecatalog/MainForm.vb index fa5406d..9343ae8 100644 --- a/imagecatalog/MainForm.vb +++ b/imagecatalog/MainForm.vb @@ -45,8 +45,8 @@ Public Class MainForm txtCifreContatore.Text = "2" TextBox25.Text = "50" TextBox26.Text = "" - TextBox7.Text = CStr(15) - TextBox8.Text = CStr(5) + TextBox7.Text = CStr(4) + TextBox8.Text = CStr(4) TextBox34.Text = "Yellow" TextBox30.Text = "20" TextBox31.Text = "6" diff --git a/imagecatalog/My Project/Application.Designer.vb b/imagecatalog/My Project/Application.Designer.vb index c844591..b8a8e28 100644 --- a/imagecatalog/My Project/Application.Designer.vb +++ b/imagecatalog/My Project/Application.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.18033 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. diff --git a/imagecatalog/My Project/Settings.Designer.vb b/imagecatalog/My Project/Settings.Designer.vb index 064b1a0..fc7d24f 100644 --- a/imagecatalog/My Project/Settings.Designer.vb +++ b/imagecatalog/My Project/Settings.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.18033 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -29,7 +29,7 @@ Namespace My Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/imagecatalog/app.config b/imagecatalog/app.config index b4d7c2c..e875fb8 100644 --- a/imagecatalog/app.config +++ b/imagecatalog/app.config @@ -20,4 +20,4 @@ - +