Skip to content

Commit

Permalink
[Update] License file
Browse files Browse the repository at this point in the history 
[Upodate] release batch files and compose batch file
  • Loading branch information
samatrhea committed Nov 19, 2023
1 parent 4b08886 commit 98ab9bc
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 46 deletions.
67 changes: 34 additions & 33 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,37 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

Additional permission under GNU GPL version 3 section 7

If you modify this Program, or any covered work, by linking or combining it with Autofac (or a modified version of that library), containing parts covered by the terms of MIT License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with DotNetZip (or a modified version of that library), containing parts covered by the terms of Microsoft Public License (Ms-PL), BSD License, Apache version 2 License, and zlib License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Microsoft.Owin (or a modified version of that library), containing parts covered by the terms of MS-.NET-Library License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Microsoft.Owin.Diagnostics (or a modified version of that library), containing parts covered by the terms of MS-.NET-Library License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Microsoft.Owin.Host.HttpListener (or a modified version of that library), containing parts covered by the terms of MS-.NET-Library License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Microsoft.Owin.Hosting (or a modified version of that library), containing parts covered by the terms of MS-.NET-Library License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Microsoft.Owin.SelfHost (or a modified version of that library), containing parts covered by the terms of MS-.NET-Library License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Mono.Posix-4.5 (or a modified version of that library), containing parts covered by the terms of MIT License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Nancy (or a modified version of that library), containing parts covered by the terms of MIT License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Nancy.Bootstrapper.Autofac (or a modified version of that library), containing parts covered by the terms of MIT License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Nancy.Owin (or a modified version of that library), containing parts covered by the terms of MIT License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Newtonsoft.Json (or a modified version of that library), containing parts covered by the terms of MIT License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with NLog (or a modified version of that library), containing parts covered by the terms of BSD 3-clause "New" or "Revised" License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Npgsql (or a modified version of that library), containing parts covered by the terms of PostgreSQL license, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with NUnit (or a modified version of that library), containing parts covered by the terms of NUnit License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with Owin-Contrib (or a modified version of that library), containing parts covered by the terms of Apache 2 License, the licensors of this Program grant you additional permission to convey the resulting work.

If you modify this Program, or any covered work, by linking or combining it with System.Threading.Tasks.Extensions (or a modified version of that library), containing parts covered by the terms of MIT License, the licensors of this Program grant you additional permission to convey the resulting work.
If you modify this Program, or any covered work, by linking or combining it with any of the software libraries listed below (or modified versions of these library), the licensors of this Program grant you additional permission to convey the resulting work.

Autofac.Extensions.DependencyInjection 8.0.0 MIT https://licenses.nuget.org/MIT
Carter 7.2.0 MIT https://licenses.nuget.org/MIT
CDP4JsonSerializer-CE 24.2.0 LGPL-3.0-only https://licenses.nuget.org/LGPL-3.0-only
CDP4MessagePackSerializer-CE 24.2.0 LGPL-3.0-only https://licenses.nuget.org/LGPL-3.0-only
coverlet.collector 6.0.0 MIT https://licenses.nuget.org/MIT
coverlet.msbuild 6.0.0 MIT https://licenses.nuget.org/MIT
DotNetZip 1.16.0 https://raw.githubusercontent.com/haf/DotNetZip.Semverd/master/LICENSE
FluentValidation 11.8.0 Apache-2.0 https://licenses.nuget.org/Apache-2.0
Hangfire.AspNetCore 1.8.6 https://raw.github.com/HangfireIO/Hangfire/master/LICENSE.md
HangFire.Autofac 2.4.1 https://raw.github.com/HangfireIO/Hangfire.Autofac/master/LICENSE
Hangfire.Core 1.8.6 https://raw.github.com/HangfireIO/Hangfire/master/LICENSE.md
Hangfire.MemoryStorage 1.8.0 http://www.apache.org/licenses/LICENSE-2.0
MailKit 4.3.0 MIT https://licenses.nuget.org/MIT
Microsoft.AspNetCore.Authentication.Negotiate 8.0.0 MIT https://licenses.nuget.org/MIT
Microsoft.AspNetCore.TestHost 8.0.0 MIT https://licenses.nuget.org/MIT
Microsoft.Extensions.Caching.Memory 8.0.0 MIT https://licenses.nuget.org/MIT
Microsoft.Extensions.Logging.Abstractions 8.0.0 MIT https://licenses.nuget.org/MIT
Microsoft.NET.Test.Sdk 17.8.0 MIT https://aka.ms/deprecateLicenseUrl
Moq 4.20.69 BSD-3-Clause https://licenses.nuget.org/BSD-3-Clause
Newtonsoft.Json 13.0.3 MIT https://licenses.nuget.org/MIT
Npgsql 7.0.6 PostgreSQL https://licenses.nuget.org/PostgreSQL
nunit 3.14.0 https://aka.ms/deprecateLicenseUrl
NUnit.Console 3.16.3 https://aka.ms/deprecateLicenseUrl
NUnit3TestAdapter 4.5.0 MIT https://licenses.nuget.org/MIT
prometheus-net 8.1.0 MIT https://licenses.nuget.org/MIT
prometheus-net.AspNetCore 8.1.0 MIT https://licenses.nuget.org/MIT
Serilog.AspNetCore 8.0.0 Apache-2.0 https://licenses.nuget.org/Apache-2.0
Serilog.Sinks.Async 1.5.0 Apache-2.0 https://licenses.nuget.org/Apache-2.0
Serilog.Sinks.Grafana.Loki 8.2.0 LICENSE https://aka.ms/deprecateLicenseUrl
SharpZipLib 1.4.2 MIT https://licenses.nuget.org/MIT
System.Configuration.ConfigurationManager 8.0.0 MIT https://licenses.nuget.org/MIT
System.Resources.Extensions 8.0.0 MIT https://licenses.nuget.org/MIT
6 changes: 3 additions & 3 deletions compose.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ GOTO End

:Serv
rem Need to build the application in Release before making the image
CALL MSBuild.exe CDP4-Server.sln -property:Configuration=Release -restore
CALL MSBuild.exe COMET-WebServices.sln -property:Configuration=Release -restore
START /B docker-compose -f docker-compose-nginx.yml up --build
GOTO End

Expand All @@ -36,7 +36,7 @@ GOTO End

:Build
rem Need to build the application in Release before making the image
CALL MSBuild.exe CDP4-Server.sln -property:Configuration=Release -restore
CALL MSBuild.exe COMET-WebServices.sln -property:Configuration=Release -restore
START /B docker-compose up --build
GOTO End

Expand Down Expand Up @@ -64,7 +64,7 @@ GOTO End
:Rebuild
START /B docker-compose down
rem Need to build the application in Release before making the image
START /B MSBuild.exe CDP4-Server.sln -property:Configuration=Release -restore
START /B MSBuild.exe COMET-WebServices.sln -property:Configuration=Release -restore
START /B docker-compose up --build -d
GOTO End

Expand Down
18 changes: 9 additions & 9 deletions release-rc.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ ECHO Cleaning up...
ECHO.

REM cleanup previous if exists
docker rmi cdp4-services-community-edition:%version%
docker rmi docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/cdp4-services-community-edition:%version%
docker rmi comet-webservices-community-edition:%version%
docker rmi docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/comet-webservices-community-edition:%version%

REM remove local latest if exists
docker rmi cdp4-services-community-edition:latest-rc
docker rmi docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/cdp4-services-community-edition:latest-rc
docker rmi comet-webservices-community-edition:latest-rc
docker rmi docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/comet-webservices-community-edition:latest-rc

ECHO.
ECHO Building images...
ECHO.

REM build and tag
docker build -t cdp4-services-community-edition:%version% -t cdp4-services-community-edition:latest-rc .
docker tag cdp4-services-community-edition:%version% docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/cdp4-services-community-edition:%version%
docker tag cdp4-services-community-edition:latest-rc docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/cdp4-services-community-edition:latest-rc
docker build -t comet-webservices-community-edition:%version% -t comet-webservices-community-edition:latest-rc .
docker tag comet-webservices-community-edition:%version% docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/comet-webservices-community-edition:%version%
docker tag comet-webservices-community-edition:latest-rc docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/comet-webservices-community-edition:latest-rc

IF %dry% equ true GOTO End

Expand All @@ -59,8 +59,8 @@ ECHO Pushing...
ECHO.

REM push
docker push docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/cdp4-services-community-edition:%version%
docker push docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/cdp4-services-community-edition:latest-rc
docker push docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/comet-webservices-community-edition:%version%
docker push docker.pkg.github.com/rheagroup/cdp4-webservices-community-edition/comet-webservices-community-edition:latest-rc

:End

Expand Down
2 changes: 1 addition & 1 deletion release.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GOTO End

:Setup

ECHO Releasing COMET Webservices Version %version%
ECHO Releasing CDP4-COMET Webservices Version %version%

set dry=false

Expand Down

0 comments on commit 98ab9bc

Please sign in to comment.