diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f609fbc7..f2117b78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -169,7 +169,7 @@ ADM:staging: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' needs: ["ADM:build"] IO:staging: @@ -183,7 +183,7 @@ IO:staging: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' needs: ["IO:build"] SITE:staging: @@ -197,7 +197,7 @@ SITE:staging: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' needs: ["SITE:build"] MON:staging: @@ -211,7 +211,7 @@ MON:staging: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' needs: ["MON:build"] TAB:staging: @@ -225,7 +225,7 @@ TAB:staging: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj' needs: ["TAB:build"] MAG:staging: @@ -239,7 +239,7 @@ MAG:staging: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' needs: ["MAG:build"] ADM:deploy: @@ -253,7 +253,7 @@ ADM:deploy: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj' needs: ["ADM:build"] IO:deploy: @@ -267,7 +267,7 @@ IO:deploy: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj' needs: ["IO:build"] SITE:deploy: @@ -281,7 +281,7 @@ SITE:deploy: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj' needs: ["SITE:build"] MON:deploy: @@ -295,7 +295,7 @@ MON:deploy: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj' needs: ["MON:build"] TAB:deploy: @@ -309,7 +309,7 @@ TAB:deploy: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj' needs: ["TAB:build"] MAG:deploy: @@ -323,7 +323,7 @@ MAG:deploy: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj' needs: ["MAG:build"] ADM:install: @@ -333,6 +333,7 @@ ADM:install: rules: - if: '$CI_COMMIT_BRANCH == "master"' when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: MP-ADM NEXUS_PATH: MP-ADM @@ -342,7 +343,7 @@ ADM:install: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' - *hashBuild - *nexusUpload needs: ["ADM:build"] @@ -354,6 +355,7 @@ IO:install: rules: - if: '$CI_COMMIT_BRANCH == "master"' when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: MP-IO NEXUS_PATH: MP-IO @@ -363,7 +365,7 @@ IO:install: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' - *hashBuild - *nexusUpload needs: ["IO:build"] @@ -375,6 +377,7 @@ SITE:install: rules: - if: '$CI_COMMIT_BRANCH == "master"' when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: MP-SITE NEXUS_PATH: MP-SITE @@ -384,7 +387,7 @@ SITE:install: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' - *hashBuild - *nexusUpload needs: ["SITE:build"] @@ -397,6 +400,7 @@ MON:install: rules: - if: '$CI_COMMIT_BRANCH == "master"' when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: MP-MON NEXUS_PATH: MP-MON @@ -406,7 +410,7 @@ MON:install: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' - *hashBuild - *nexusUpload needs: ["MON:build"] @@ -418,6 +422,7 @@ TAB:install: rules: - if: '$CI_COMMIT_BRANCH == "master"' when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: MP-TAB NEXUS_PATH: MP-TAB @@ -427,7 +432,7 @@ TAB:install: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' - *hashBuild - *nexusUpload needs: ["TAB:build"] @@ -439,6 +444,7 @@ MAG:install: rules: - if: '$CI_COMMIT_BRANCH == "master"' when: manual + - if: '$CI_COMMIT_BRANCH == "develop"' variables: APP_NAME: MP-MAG NEXUS_PATH: MP-MAG @@ -448,7 +454,7 @@ MAG:install: - '& "$env:NUGET_PATH" restore MAPO.sln' - *version-fix script: - - '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' + - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj' - *hashBuild - *nexusUpload needs: ["MAG:build"] diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index a266b61a..bb654f97 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -472,10 +472,8 @@ - - @@ -505,8 +503,6 @@ - - @@ -596,8 +592,6 @@ - - diff --git a/MP-ADM/libmongocrypt.dylib b/MP-ADM/libmongocrypt.dylib deleted file mode 100644 index 91418d4d..00000000 Binary files a/MP-ADM/libmongocrypt.dylib and /dev/null differ diff --git a/MP-ADM/libmongocrypt.so b/MP-ADM/libmongocrypt.so deleted file mode 100644 index 2e6bae00..00000000 Binary files a/MP-ADM/libmongocrypt.so and /dev/null differ diff --git a/MP-ADM/libzstd.dll b/MP-ADM/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MP-ADM/libzstd.dll and /dev/null differ diff --git a/MP-ADM/mongocrypt.dll b/MP-ADM/mongocrypt.dll deleted file mode 100644 index 39d7e016..00000000 Binary files a/MP-ADM/mongocrypt.dll and /dev/null differ diff --git a/MP-ADM/snappy32.dll b/MP-ADM/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MP-ADM/snappy32.dll and /dev/null differ diff --git a/MP-ADM/snappy64.dll b/MP-ADM/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MP-ADM/snappy64.dll and /dev/null differ diff --git a/MagData/MagData.csproj b/MagData/MagData.csproj index 10f3f0be..b7672216 100644 --- a/MagData/MagData.csproj +++ b/MagData/MagData.csproj @@ -166,6 +166,9 @@ + + MoonPro.cs + True True @@ -248,8 +251,6 @@ DS_Utility.xsd - - SettingsSingleFileGenerator @@ -262,10 +263,6 @@ - - - - diff --git a/MagData/Properties/AssemblyInfo.cs b/MagData/Properties/AssemblyInfo.cs index 3db39823..ea2b440a 100644 --- a/MagData/Properties/AssemblyInfo.cs +++ b/MagData/Properties/AssemblyInfo.cs @@ -2,15 +2,15 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// Le informazioni generali relative a un assembly sono controllate dal seguente +// Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. [assembly: AssemblyTitle("MagData")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +//[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("MagData")] -[assembly: AssemblyCopyright("Copyright © 2020")] +//[assembly: AssemblyCopyright("Copyright © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +//[assembly: AssemblyVersion("1.0.0.0")] +//[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/MagData/libmongocrypt.dylib b/MagData/libmongocrypt.dylib deleted file mode 100644 index 91418d4d..00000000 Binary files a/MagData/libmongocrypt.dylib and /dev/null differ diff --git a/MagData/libmongocrypt.so b/MagData/libmongocrypt.so deleted file mode 100644 index 2e6bae00..00000000 Binary files a/MagData/libmongocrypt.so and /dev/null differ diff --git a/MagData/libzstd.dll b/MagData/libzstd.dll deleted file mode 100644 index e669123c..00000000 Binary files a/MagData/libzstd.dll and /dev/null differ diff --git a/MagData/mongocrypt.dll b/MagData/mongocrypt.dll deleted file mode 100644 index 39d7e016..00000000 Binary files a/MagData/mongocrypt.dll and /dev/null differ diff --git a/MagData/snappy32.dll b/MagData/snappy32.dll deleted file mode 100644 index afc82ca4..00000000 Binary files a/MagData/snappy32.dll and /dev/null differ diff --git a/MagData/snappy64.dll b/MagData/snappy64.dll deleted file mode 100644 index 36cd5fe7..00000000 Binary files a/MagData/snappy64.dll and /dev/null differ diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index dc004634..eed72731 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -207,6 +207,9 @@ + + MoonPro.cs + diff --git a/MapoDb/Properties/AssemblyInfo.cs b/MapoDb/Properties/AssemblyInfo.cs index 51bc88ad..fb4396e8 100644 --- a/MapoDb/Properties/AssemblyInfo.cs +++ b/MapoDb/Properties/AssemblyInfo.cs @@ -1,20 +1,20 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// 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("MapoDb")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Steamware s.r.l.")] +//[assembly: AssemblyCompany("Steamware s.r.l.")] [assembly: AssemblyProduct("MapoDb")] -[assembly: AssemblyCopyright("Copyright © Steamware 2007")] +//[assembly: AssemblyCopyright("Copyright © Steamware 2007")] [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 +// 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(true)] @@ -24,11 +24,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.1")] -[assembly: AssemblyFileVersion("1.0.0.1")] +//[assembly: AssemblyVersion("1.0.0.1")] +//[assembly: AssemblyFileVersion("1.0.0.1")] \ No newline at end of file diff --git a/VersGen/MoonPro.cs b/VersGen/MoonPro.cs index 0bbaaeb4..395f4dbd 100644 --- a/VersGen/MoonPro.cs +++ b/VersGen/MoonPro.cs @@ -7,5 +7,5 @@ using System.Reflection; [assembly: AssemblyVersion("0.0.0.0")] [assembly: AssemblyFileVersion("0.0.0.0")] -[assembly: AssemblyCopyright("SteamWare-EgalWare © 2006+")] +[assembly: AssemblyCopyright("SteamWare-EgalWare © 2007+")] [assembly: AssemblyCompany("EgalWare")] diff --git a/VersGen/MoonPro.tt b/VersGen/MoonPro.tt index 43d406e8..bbca491c 100644 --- a/VersGen/MoonPro.tt +++ b/VersGen/MoonPro.tt @@ -8,5 +8,5 @@ using System.Reflection; [assembly: AssemblyVersion("0.0.0.0")] [assembly: AssemblyFileVersion("0.0.0.0")] -[assembly: AssemblyCopyright("SteamWare-EgalWare © 2006+")] +[assembly: AssemblyCopyright("SteamWare-EgalWare © 2007+")] [assembly: AssemblyCompany("EgalWare")]