From 1c052253932c7c535f5cefc27c62e83f68b6793a Mon Sep 17 00:00:00 2001 From: Marcel Nellesen Date: Wed, 20 Jan 2021 07:39:03 +0100 Subject: [PATCH 1/2] Update: New action for contacting the PID owner of a project (coscine/issues#1202) --- .../Properties/AssemblyInfo.cs | 8 ++--- src/NotificationConfiguration/Actions.json | 32 +++++++++++++++++-- .../Properties/AssemblyInfo.cs | 8 ++--- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/NotificationConfiguration.Test/Properties/AssemblyInfo.cs b/src/NotificationConfiguration.Test/Properties/AssemblyInfo.cs index 179507f..49d86c6 100644 --- a/src/NotificationConfiguration.Test/Properties/AssemblyInfo.cs +++ b/src/NotificationConfiguration.Test/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("NotificationConfiguration.Test is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("NotificationConfiguration.Test")] -[assembly: AssemblyVersion("1.5.0")] -[assembly: AssemblyFileVersion("1.5.0")] -[assembly: AssemblyInformationalVersion("1.5.0-topic-1163-admin0001")] -[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] +[assembly: AssemblyVersion("1.6.0")] +[assembly: AssemblyFileVersion("1.6.0")] +[assembly: AssemblyInformationalVersion("1.6.0-topic-1202-pidap0002")] +[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")] diff --git a/src/NotificationConfiguration/Actions.json b/src/NotificationConfiguration/Actions.json index 451536e..1b73e1a 100644 --- a/src/NotificationConfiguration/Actions.json +++ b/src/NotificationConfiguration/Actions.json @@ -167,7 +167,7 @@ }, "group": [] }, - "pid_contact": { + "pid_contact_resource": { "channels": { "available": [], "always": [], @@ -177,7 +177,7 @@ "email": { "de": { "subject": "[CoScInE] Anfrage zu {{resourceName}} des Projekts {{_projectName}}", - "body": "{{> header}}Sehr geehrter {{_targetUserName}},

Es wurde eine extern Anfrage bezüglich der Ressource {{resourceName}} Ihres Coscine-Projekts {{_projectName}} gesendet.
Sie und alle anderen Projektinhaber haben diese Nachricht erhalten.

Bitte beachten Sie:
Ihre E-Mail-Adresse wurde nicht an die Person weitergegeben, die die Anfrage initiiert hat. Die Nachricht wurde von Coscine weitergeleitet.

Wenn Sie sich dafür entscheiden, die Anfrage über die untenstehenden Kontaktinformationen zu beantworten, erhält die anfragende Person Informationen über Ihre E-Mail-Adresse.

Haftungsausschluss: Der Inhalt der Anfrage wurde nicht von Coscine erstellt. Bitte melden Sie jeglichen Missbrauch des Kontaktformulars an servicedesk@itc.rwth-aachen.de

Mit freundlichen Grüßen
Ihr Coscine-Team


---

Anfrage Informationen
Name: {{requesterName}}
Kontakt: {{requesterMail}}

Nachricht: {{requestMessage}}{{> footer}}" + "body": "{{> header}}Sehr geehrter {{_targetUserName}},

Es wurde eine externe Anfrage bezüglich der Ressource {{resourceName}} Ihres Coscine-Projekts {{_projectName}} gesendet.
Sie und alle anderen Projektinhaber haben diese Nachricht erhalten.

Bitte beachten Sie:
Ihre E-Mail-Adresse wurde nicht an die Person weitergegeben, die die Anfrage initiiert hat. Die Nachricht wurde von Coscine weitergeleitet.

Wenn Sie sich dafür entscheiden, die Anfrage über die untenstehenden Kontaktinformationen zu beantworten, erhält die anfragende Person Informationen über Ihre E-Mail-Adresse.

Haftungsausschluss: Der Inhalt der Anfrage wurde nicht von Coscine erstellt. Bitte melden Sie jeglichen Missbrauch des Kontaktformulars an servicedesk@itc.rwth-aachen.de

Mit freundlichen Grüßen
Ihr Coscine-Team


---

Anfrage Informationen
Name: {{requesterName}}
Kontakt: {{requesterMail}}

Nachricht: {{requestMessage}}{{> footer}}" }, "en": { "subject": "[CoScInE] Request for {{resourceName}} of project {{_projectName}}", @@ -195,6 +195,34 @@ }, "group": [] }, + "pid_contact_project": { + "channels": { + "available": [], + "always": [], + "only": [ "email" ] + }, + "template": { + "email": { + "de": { + "subject": "[CoScInE] Anfrage zu Projekt {{_projectName}}", + "body": "{{> header}}Sehr geehrter {{_targetUserName}},

Es wurde eine externe Anfrage bezüglich Ihres Coscine-Projekts {{_projectName}} gesendet.
Sie und alle anderen Projektinhaber haben diese Nachricht erhalten.

Bitte beachten Sie:
Ihre E-Mail-Adresse wurde nicht an die Person weitergegeben, die die Anfrage initiiert hat. Die Nachricht wurde von Coscine weitergeleitet.

Wenn Sie sich dafür entscheiden, die Anfrage über die untenstehenden Kontaktinformationen zu beantworten, erhält die anfragende Person Informationen über Ihre E-Mail-Adresse.

Haftungsausschluss: Der Inhalt der Anfrage wurde nicht von Coscine erstellt. Bitte melden Sie jeglichen Missbrauch des Kontaktformulars an servicedesk@itc.rwth-aachen.de

Mit freundlichen Grüßen
Ihr Coscine-Team


---

Anfrage Informationen
Name: {{requesterName}}
Kontakt: {{requesterMail}}

Nachricht: {{requestMessage}}{{> footer}}" + }, + "en": { + "subject": "[CoScInE] Request for project {{_projectName}}", + "body": "{{> header}}Dear {{_targetUserName}},

an external request was sent, regarding your Coscine project: {{_projectName}}.
You and all other project owners have been relayed this message.

Please note:
Your E-Mail adress was not disclosed to the person who initiated the requested. The message was relayed by Coscine.

If you choose to answer the request via the contact information below, the requesting person will gain information about your E-Mail address.

Disclaimer: The content of the request was not created by Coscine. Please report any abuse of the contact form to servicedesk@itc.rwth-aachen.de

Best regards
Your Coscine team

---

Request Information
Name: {{requesterName}}


Contact Mail: {{requesterMail}}


Message: {{requestMessage}}{{> footer}}" + } + } + }, + "name": { + "de": "PID Besitzer kontaktiert", + "en": "PID Owner contacted" + }, + "description": { + "de": "Sie werden informiert, wenn der Besitzer einer PID kontaktiert wird.", + "en": "You will be informed when a PID owner is contacted." + }, + "group": [] + }, "pid_contact_requester": { "channels": { "available": [], diff --git a/src/NotificationConfiguration/Properties/AssemblyInfo.cs b/src/NotificationConfiguration/Properties/AssemblyInfo.cs index 8fc2854..9189f1b 100644 --- a/src/NotificationConfiguration/Properties/AssemblyInfo.cs +++ b/src/NotificationConfiguration/Properties/AssemblyInfo.cs @@ -9,8 +9,8 @@ using System.Reflection; [assembly: AssemblyDescription("NotificationConfiguration is a part of the CoScInE group.")] [assembly: AssemblyCompany("IT Center, RWTH Aachen University")] [assembly: AssemblyProduct("NotificationConfiguration")] -[assembly: AssemblyVersion("1.5.0")] -[assembly: AssemblyFileVersion("1.5.0")] -[assembly: AssemblyInformationalVersion("1.5.0-topic-1163-admin0001")] -[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] +[assembly: AssemblyVersion("1.6.0")] +[assembly: AssemblyFileVersion("1.6.0")] +[assembly: AssemblyInformationalVersion("1.6.0-topic-1202-pidap0002")] +[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")] -- GitLab From 15f962f6d8a7affc0ac02036863f13b1fcdbf280 Mon Sep 17 00:00:00 2001 From: Petar Hristov Date: Thu, 28 Jan 2021 07:10:16 +0100 Subject: [PATCH 2/2] Update: Support for .NET 5.0 added. Current Target Frameworks are .NET Framework 4.6.1 and .NET 5.0 (coscine/issues#1226) --- .gitlab-ci.yml | 84 ++--- LICENSE | 2 +- build.cake | 351 ------------------ build.ps1 | 255 ------------- build.sh | 122 ------ .../NotificationConfiguration.Test.csproj | 89 +---- .../Properties/AssemblyInfo.cs | 9 +- .../packages.config | 6 - .../NotificationConfiguration.csproj | 98 ++--- .../Properties/AssemblyInfo.cs | 8 +- src/NotificationConfiguration/packages.config | 4 - tools/packages.config | 4 - 12 files changed, 76 insertions(+), 956 deletions(-) delete mode 100644 build.cake delete mode 100644 build.ps1 delete mode 100644 build.sh delete mode 100644 src/NotificationConfiguration.Test/packages.config delete mode 100644 src/NotificationConfiguration/packages.config delete mode 100644 tools/packages.config diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b339a45..b42fee1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,55 +1,33 @@ +include: + - project: coscine/tools/gitlab-ci-templates + file: + - /dotnet.yml + stages: + - build - test - - release - - releasetrigger - -cake:Test: - stage: test - script: - - PowerShell .\build.ps1 -Target Test -Configuration Debug - variables: - GIT_STRATEGY: clone - artifacts: - reports: - junit: "./Artifacts/TestResults.xml" - paths: - - "./Artifacts/*" - except: - - master - - tags - -cake:Release: - stage: release - script: - - PowerShell .\build.ps1 -Target Release -Configuration Release --nugetApiKey="${NUGET_API_KEY}" - variables: - GIT_STRATEGY: clone - dependencies: - - cake:Test - artifacts: - paths: - - "./Artifacts/*" - only: - - tags - -cake:Prerelease: - stage: release - script: - - PowerShell .\build.ps1 -Target Prerelease -Configuration Release - variables: - GIT_STRATEGY: clone - dependencies: - - cake:Test - artifacts: - paths: - - "./Artifacts/*" - except: - - tags - - master - -cake:GitlabRelease: - stage: releasetrigger - script: - - PowerShell .\build.ps1 -Target GitlabRelease --GitlabProjectPath="${CI_PROJECT_PATH}" --gitlabProjectId="${CI_PROJECT_ID}" --gitlabToken="${GITLAB_TOKEN}" - only: - - master \ No newline at end of file + - publish + +variables: + DOTNET_MAIN_PROJECT_FOLDER: NotificationConfiguration + +build-branch: + extends: .build-branch + +build-nuget-release: + extends: .build-nuget-release + +test: + extends: .test + +publish-branch-prerelease: + extends: .publish-branch-prerelease + +publish-gitlab-release: + extends: .publish-gitlab-release + +publish-master-release: + extends: .publish-master-release + +publish-nuget-release: + extends: .publish-nuget-release diff --git a/LICENSE b/LICENSE index b8cd48a..b2b571a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 RWTH Aachen University +Copyright (c) 2021 RWTH Aachen University Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/build.cake b/build.cake deleted file mode 100644 index 81648ff..0000000 --- a/build.cake +++ /dev/null @@ -1,351 +0,0 @@ -#tool nuget:?package=NUnit.ConsoleRunner&version=3.10.0 -#tool nuget:?package=vswhere&version=2.8.4 -#tool nuget:?package=GitVersion.CommandLine&version=5.1.3 - -#addin nuget:https://api.nuget.org/v3/index.json?package=Cake.Json&version=4.0.0 -#addin nuget:https://api.nuget.org/v3/index.json?package=Newtonsoft.Json&version=11.0.2 -#addin nuget:https://api.nuget.org/v3/index.json?package=Cake.FileHelpers&version=3.2.1 - -using System.Net; -using System.Net.Http; - -// Commandline arguments -var target = Argument("target", "Default"); -var configuration = Argument("configuration", "Release"); -var nugetApiKey = Argument("nugetApiKey", null); -var version = Argument("nugetVersion", ""); -var gitlabProjectPath = Argument("gitlabProjectPath", ""); -var gitlabProjectId = Argument("gitlabProjectId", ""); -var gitlabToken = Argument("gitlabToken", ""); - -// Define directories -var projects = GetFiles("./**/*.csproj"); -var artifactsDir = Directory("./Artifacts"); -string nupkgDir; -var solutionFile = GetFiles("./**/*.sln").First(); -var projectName = solutionFile.GetFilenameWithoutExtension().ToString(); -var nugetSource = "https://api.nuget.org/v3/index.json"; -var assemblyInfoSubPath = "Properties/AssemblyInfo.cs"; -var semanticVersion = ""; -string localNugetFeed; - -// get latest MSBuild version -var vsLatest = VSWhereLatest(); -var msBuildPathX64 = (vsLatest == null) ? null : vsLatest.CombineWithFilePath("./MSBuild/Current/Bin/MSBuild.exe"); - -Setup(context =>{ - nupkgDir = $"{artifactsDir.ToString()}/nupkg"; - var branch = GitVersion(new GitVersionSettings { - UpdateAssemblyInfo = false - }).BranchName.Replace("/", "-"); - - localNugetFeed = $"C:\\coscine\\LocalNugetFeeds\\{branch}"; - Information("{0}", branch); - Information("Started at {0}", DateTime.Now); -}); - -Teardown(context =>{ - Information("Finished at {0}", DateTime.Now); -}); - -Task("Clean") -.Description("Cleans all build and artifacts directories") -.Does(() =>{ - var settings = new DeleteDirectorySettings { - Recursive = true, - Force = true - }; - - var directoriesToClean = new List(); - - foreach(var project in projects) { - directoriesToClean.Add(Directory($"{project.GetDirectory()}/obj")); - directoriesToClean.Add(Directory($"{project.GetDirectory()}/bin")); - } - - directoriesToClean.Add(artifactsDir); - - foreach(var dir in directoriesToClean) { - Information("Cleaning {0}", dir.ToString()); - if (DirectoryExists(dir)) { - DeleteDirectory(dir, settings); - CreateDirectory(dir); - } else { - CreateDirectory(dir); - } - } -}); - -Task("Restore") -.Does(() =>{ - NuGetRestore(solutionFile, new NuGetRestoreSettings { - NoCache = true, - FallbackSource = new List{ localNugetFeed }, - }); -}); - -Task("Test") -.IsDependentOn("Build") -.Does(() =>{ - NUnit3($"./src/**/bin/{configuration}/*.Tests.dll", new NUnit3Settings { - // generate the xml file - NoResults = false, - Results = new NUnit3Result[] { - new NUnit3Result() { - FileName = $"{artifactsDir}/TestResults.xml", - Transform = $"{Context.Environment.WorkingDirectory}/nunit3-junit.xslt" - } - } - }); -}); - -Task("GitVersion") -.Does(() => { - if(string.IsNullOrWhiteSpace(version)) { - version = GitVersion(new GitVersionSettings { - UpdateAssemblyInfo = false - }).NuGetVersionV2; - } - var index = version.IndexOf("-"); - semanticVersion = index > 0 ? version.Substring(0, index) : version; - Information("Version: {0}, SemanticVersion: {1}", version, semanticVersion); -}); - -Task("UpdateAssemblyInfo") -.Does(() =>{ - var index = version.IndexOf("-"); - var semanticVersion = index > 0 ? version.Substring(0, index) : version; - - foreach(var project in projects) { - CreateAssemblyInfo($"{project.GetDirectory()}/{assemblyInfoSubPath}", new AssemblyInfoSettings { - Product = project.GetFilenameWithoutExtension().ToString(), - Title = project.GetFilenameWithoutExtension().ToString(), - Company = "IT Center, RWTH Aachen University", - Version = semanticVersion, - FileVersion = semanticVersion, - InformationalVersion = version, - Copyright = $"{DateTime.Now.Year} IT Center, RWTH Aachen University", - Description = $"{project.GetFilenameWithoutExtension().ToString()} is a part of the CoScInE group." - }); - } -}); - -Task("GitlabRelease") -.IsDependentOn("GitVersion") -.Does(() => { - var client = new HttpClient(); - client.DefaultRequestHeaders.Add("PRIVATE-TOKEN", gitlabToken); - - // get the latest tag - var result = client.GetAsync($"https://git.rwth-aachen.de/api/v4/projects/{gitlabProjectId}/repository/tags").Result; - if(!result.IsSuccessStatusCode) { - throw new Exception("Tag query failed."); - } - - var tagList = result.Content.ReadAsStringAsync().Result; - var jArray = JArray.Parse(tagList); - // null if not tags exists yet - var lastTag = jArray.Select(x => x["name"]).FirstOrDefault(); - - var url = $"https://git.rwth-aachen.de/{gitlabProjectPath}"; - - if(url.EndsWith(".git")) { - url = url.Substring(0, url.Length - ".git".Length); - } - - if(url.EndsWith("/")) { - url = url.Substring(0, url.Length - 1); - } - - var description = ""; - // First line of description - // Gitlab compare url, if something can be compared - if(lastTag == null) { - description = $"# {semanticVersion} ({DateTime.Now.Year}-{DateTime.Now.Month}-{DateTime.Now.Day})\n\n\n"; - } else { - description = $"# [{semanticVersion}]({url}/compare/{lastTag}...v{semanticVersion}) ({DateTime.Now.Year}-{DateTime.Now.Month}-{DateTime.Now.Day})\n\n\n"; - } - - // From when will messages be parsed, null results in all messages - var logParam = ""; - if(lastTag != null) { - logParam = $"{lastTag}..Head"; - } - - Information(lastTag); - - IEnumerable redirectedStandardOutput; - var exitCodeWithArgument = - StartProcess( - "git", - new ProcessSettings { - Arguments = $"log {logParam} --pretty=format:HASH%h:%B", - RedirectStandardOutput = true - }, - out redirectedStandardOutput - ); - - var prefixList = new Dictionary>{ - {"Fix", new List()}, - {"Update", new List()}, - {"New", new List()}, - {"Breaking", new List()}, - {"Docs", new List()}, - {"Build", new List()}, - {"Upgrade", new List()}, - {"Chore", new List()}, - }; - - var currentHash = ""; - // Output last line of process output. - foreach(var line in redirectedStandardOutput) { - var commitMessage = ""; - if(line.StartsWith("HASH")) { - currentHash = line.Substring("HASH".Length); - currentHash = currentHash.Substring(0, currentHash.IndexOf(":")); - commitMessage = line.Substring(currentHash.Length + line.IndexOf(currentHash) + 1); - } else { - commitMessage = line; - } - - foreach(var kv in prefixList) { - if(commitMessage.StartsWith($"{kv.Key}:")) { - kv.Value.Add($"* {commitMessage.Substring(kv.Key.Length + 1).Trim()} {currentHash}"); - break; - } - }; - } - - foreach(var kv in prefixList) { - if(kv.Value.Any()) { - description += $" ### {kv.Key}\n\n"; - foreach(var line in kv.Value) { - description += $"{line}\n"; - } - description += "\n"; - } - } - // correctly escape the json newlines - description = description.Replace("\n", "\\n"); - Information("Description: {0}", description); - - // create tag - result = client.PostAsync($"https://git.rwth-aachen.de/api/v4/projects/{gitlabProjectId}/repository/tags?tag_name=v{semanticVersion}&ref=master", null).Result; - Information("Create tag: {0}", result.Content.ReadAsStringAsync().Result); - if(!result.IsSuccessStatusCode) { - throw new Exception("Tag creation failed."); - } - - // create release - var json = $"{{\"name\": \"v{semanticVersion}\", \"tag_name\": \"v{semanticVersion}\", \"description\": \"{description}\"}}"; - var content = new StringContent(json, Encoding.UTF8, "application/json"); - result = client.PostAsync($"https://git.rwth-aachen.de/api/v4/projects/{gitlabProjectId}/releases", content).Result; - Information("Create release: {0}", result.Content.ReadAsStringAsync().Result); - if(!result.IsSuccessStatusCode) { - throw new Exception("Release creation failed."); - } -}); - -Task("Build") -.IsDependentOn("Clean") -.IsDependentOn("GitVersion") -.IsDependentOn("UpdateAssemblyInfo") -.IsDependentOn("Restore") -.Does(() =>{ - var frameworkSettingsWindows = new MSBuildSettings { - Configuration = configuration - }; - - frameworkSettingsWindows.ToolPath = msBuildPathX64; - frameworkSettingsWindows.WorkingDirectory = Context.Environment.WorkingDirectory; - - if (configuration.Equals("Release")) { - frameworkSettingsWindows.WithProperty("DebugSymbols", "false"); - frameworkSettingsWindows.WithProperty("DebugType", "None"); - } - - // Use MSBuild - Information("Building {0}", solutionFile); - MSBuild(solutionFile, frameworkSettingsWindows); -}); - -Task("NugetPack") -.IsDependentOn("Build") -.Does(() =>{ - foreach(var project in projects) { - var nuspec = $"{project.GetDirectory()}/{project.GetFilenameWithoutExtension()}.nuspec"; - if(!project.ToString().EndsWith(".Tests") && FileExists(nuspec)) - { - var settings = new NuGetPackSettings - { - OutputDirectory = nupkgDir, - Version = version, - Properties = new Dictionary - { - { "Configuration", configuration} - } - }; - NuGetPack(project.ToString(), settings); - } - } -}); - -Task("NugetPush") -.IsDependentOn("NugetPack") -.Does(() =>{ - var nupkgs = GetFiles($"{nupkgDir}/*.nupkg"); - Information("Need to push {0} packages", nupkgs.Count); - if(!String.IsNullOrWhiteSpace(nugetApiKey)) { - foreach(var nupkg in nupkgs) { - Information("Pushing {0}", nupkg); - NuGetPush(nupkg, new NuGetPushSettings { - Source = nugetSource, - ApiKey = nugetApiKey - }); - } - } else { - Information("NugetApiKey is not set. Can't push."); - throw new Exception("NugetApiKey is not set. Can't push."); - } -}); - -Task("CopyToArtifacts") -.Does(() =>{ - foreach(var project in projects) { - if(!project.GetDirectory().ToString().EndsWith(".Tests") - && !FileExists($"{project.GetDirectory()}/{project.GetFilenameWithoutExtension()}.nuspec") - && DirectoryExists(project.GetDirectory())) - { - Information("Copying {0}/* to {1}", $"{project.GetDirectory()}/bin/{configuration}", artifactsDir); - CopyDirectory($"{project.GetDirectory()}/bin/{configuration}/", artifactsDir); - } - } -}); - -Task("NugetPushLocal") -.IsDependentOn("NugetPack") -.Does(() =>{ - var nupkgs = GetFiles($"{nupkgDir}/*.nupkg"); - foreach(var nupkg in nupkgs) { - if(!DirectoryExists(localNugetFeed)) { - CreateDirectory(localNugetFeed); - } - CopyFile(nupkg.ToString(), $"{localNugetFeed}\\{nupkg.GetFilename()}"); - } -}); - -Task("Prerelease") -.IsDependentOn("Build") -.IsDependentOn("CopyToArtifacts") -.IsDependentOn("NugetPushLocal"); - -Task("Release") -.IsDependentOn("NugetPack") -.IsDependentOn("CopyToArtifacts") -.IsDependentOn("NugetPushLocal") -.IsDependentOn("NugetPush"); - -Task("Default") -.IsDependentOn("Test"); - -RunTarget(target); diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index f83382e..0000000 --- a/build.ps1 +++ /dev/null @@ -1,255 +0,0 @@ -#The MIT License (MIT) -# -#Copyright (c) 2014 - 2016 Patrik Svensson, Mattias Karlsson, Gary Ewan Park and contributors -# -#Permission is hereby granted, free of charge, to any person obtaining a copy of -#this software and associated documentation files (the "Software"), to deal in -#the Software without restriction, including without limitation the rights to -#use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -#the Software, and to permit persons to whom the Software is furnished to do so, -#subject to the following conditions: -# -#The above copyright notice and this permission notice shall be included in all -#copies or substantial portions of the Software. -# -#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -#FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -#COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -#IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -#CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -########################################################################## -# This is the Cake bootstrapper script for PowerShell. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -<# - -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. - -.DESCRIPTION -This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) -and execute your Cake build script with the parameters you provide. - -.PARAMETER Script -The build script to execute. -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.PARAMETER ShowDescription -Shows description about tasks. -.PARAMETER DryRun -Performs a dry run. -.PARAMETER Experimental -Uses the nightly builds of the Roslyn script engine. -.PARAMETER Mono -Uses the Mono Compiler rather than the Roslyn script engine. -.PARAMETER SkipToolPackageRestore -Skips restoring of packages. -.PARAMETER ScriptArgs -Remaining arguments are added here. - -.LINK -https://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Script = "build.cake", - [string]$Target, - [string]$Configuration, - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity, - [switch]$ShowDescription, - [Alias("WhatIf", "Noop")] - [switch]$DryRun, - [switch]$Experimental, - [switch]$Mono, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null -function MD5HashFile([string] $filePath) -{ - if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) - { - return $null - } - - [System.IO.Stream] $file = $null; - [System.Security.Cryptography.MD5] $md5 = $null; - try - { - $md5 = [System.Security.Cryptography.MD5]::Create() - $file = [System.IO.File]::OpenRead($filePath) - return [System.BitConverter]::ToString($md5.ComputeHash($file)) - } - finally - { - if ($file -ne $null) - { - $file.Dispose() - } - } -} - -function GetProxyEnabledWebClient -{ - $wc = New-Object System.Net.WebClient - $proxy = [System.Net.WebRequest]::GetSystemWebProxy() - $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials - $wc.Proxy = $proxy - return $wc -} - -Write-Host "Preparing to run build script..." - -if(!$PSScriptRoot){ - $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent -} - -$TOOLS_DIR = Join-Path $PSScriptRoot "tools" -$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins" -$MODULES_DIR = Join-Path $TOOLS_DIR "Modules" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" -$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" -$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" -$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" -$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" - -# Make sure tools folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type directory | out-null -} - -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch { - Throw "Could not download packages.config." - } -} - -# Try find NuGet.exe in path if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Trying to find nuget.exe in PATH..." - $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } - $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 - if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { - Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." - $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName - } -} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# Save nuget.exe path to environment to be available to child processed -$ENV:NUGET_EXE = $NUGET_EXE - -# Restore tools from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { - Push-Location - Set-Location $TOOLS_DIR - - # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG) - if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed package.config hash..." - Remove-Item * -Recurse -Exclude packages.config,nuget.exe - } - - Write-Verbose -Message "Restoring tools from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet tools." - } - else - { - $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | out-string) - - Pop-Location -} - -# Restore addins from NuGet -if (Test-Path $ADDINS_PACKAGES_CONFIG) { - Push-Location - Set-Location $ADDINS_DIR - - Write-Verbose -Message "Restoring addins from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet addins." - } - - Write-Verbose -Message ($NuGetOutput | out-string) - - Pop-Location -} - -# Restore modules from NuGet -if (Test-Path $MODULES_PACKAGES_CONFIG) { - Push-Location - Set-Location $MODULES_DIR - - Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet modules." - } - - Write-Verbose -Message ($NuGetOutput | out-string) - - Pop-Location -} - -# Make sure that Cake has been installed. -if (!(Test-Path $CAKE_EXE)) { - Throw "Could not find Cake.exe at $CAKE_EXE" -} - - - -# Build Cake arguments -$cakeArguments = @("$Script"); -if ($Target) { $cakeArguments += "-target=$Target" } -if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } -if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" } -if ($ShowDescription) { $cakeArguments += "-showdescription" } -if ($DryRun) { $cakeArguments += "-dryrun" } -if ($Experimental) { $cakeArguments += "-experimental" } -if ($Mono) { $cakeArguments += "-mono" } -$cakeArguments += $ScriptArgs - -# Start Cake -Write-Host "Running build script..." -&$CAKE_EXE $cakeArguments -exit $LASTEXITCODE diff --git a/build.sh b/build.sh deleted file mode 100644 index d088917..0000000 --- a/build.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/env bash - -#The MIT License (MIT) -# -#Copyright (c) 2014 - 2016 Patrik Svensson, Mattias Karlsson, Gary Ewan Park and contributors -# -#Permission is hereby granted, free of charge, to any person obtaining a copy of -#this software and associated documentation files (the "Software"), to deal in -#the Software without restriction, including without limitation the rights to -#use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -#the Software, and to permit persons to whom the Software is furnished to do so, -#subject to the following conditions: -# -#The above copyright notice and this permission notice shall be included in all -#copies or substantial portions of the Software. -# -#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -#FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -#COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -#IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -#CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -########################################################################## -# This is the Cake bootstrapper script for Linux and OS X. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -# Define directories. -SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -TOOLS_DIR=$SCRIPT_DIR/tools -NUGET_EXE=$TOOLS_DIR/nuget.exe -CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe -PACKAGES_CONFIG=$TOOLS_DIR/packages.config -PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum - -# Define md5sum or md5 depending on Linux/OSX -MD5_EXE= -if [[ "$(uname -s)" == "Darwin" ]]; then - MD5_EXE="md5 -r" -else - MD5_EXE="md5sum" -fi - -# Define default arguments. -SCRIPT="build.cake" -TARGET="Default" -CONFIGURATION="Release" -VERBOSITY="verbose" -DRYRUN= -SHOW_VERSION=false -SCRIPT_ARGUMENTS=() - -# Parse arguments. -for i in "$@"; do - case $1 in - -s|--script) SCRIPT="$2"; shift ;; - -t|--target) TARGET="$2"; shift ;; - -c|--configuration) CONFIGURATION="$2"; shift ;; - -v|--verbosity) VERBOSITY="$2"; shift ;; - -d|--dryrun) DRYRUN="-dryrun" ;; - --version) SHOW_VERSION=true ;; - --) shift; SCRIPT_ARGUMENTS+=("$@"); break ;; - *) SCRIPT_ARGUMENTS+=("$1") ;; - esac - shift -done - -# Make sure the tools folder exist. -if [ ! -d "$TOOLS_DIR" ]; then - mkdir "$TOOLS_DIR" -fi - -# Make sure that packages.config exist. -if [ ! -f "$TOOLS_DIR/packages.config" ]; then - echo "Downloading packages.config..." - curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages - if [ $? -ne 0 ]; then - echo "An error occurred while downloading packages.config." - exit 1 - fi -fi - -# Download NuGet if it does not exist. -if [ ! -f "$NUGET_EXE" ]; then - echo "Downloading NuGet..." - curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - if [ $? -ne 0 ]; then - echo "An error occurred while downloading nuget.exe." - exit 1 - fi -fi - -# Restore tools from NuGet. -pushd "$TOOLS_DIR" >/dev/null -if [ ! -f $PACKAGES_CONFIG_MD5 ] || [ "$( cat $PACKAGES_CONFIG_MD5 | sed 's/\r$//' )" != "$( $MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' )" ]; then - find . -type d ! -name . | xargs rm -rf -fi - -mono "$NUGET_EXE" install -ExcludeVersion -if [ $? -ne 0 ]; then - echo "Could not restore NuGet packages." - exit 1 -fi - -$MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' >| $PACKAGES_CONFIG_MD5 - -popd >/dev/null - -# Make sure that Cake has been installed. -if [ ! -f "$CAKE_EXE" ]; then - echo "Could not find Cake.exe at '$CAKE_EXE'." - exit 1 -fi - -# Start Cake -if $SHOW_VERSION; then - exec mono "$CAKE_EXE" -version -else - exec mono "$CAKE_EXE" $SCRIPT -verbosity=$VERBOSITY -configuration=$CONFIGURATION -target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}" -fi \ No newline at end of file diff --git a/src/NotificationConfiguration.Test/NotificationConfiguration.Test.csproj b/src/NotificationConfiguration.Test/NotificationConfiguration.Test.csproj index a98032a..95dbc2f 100644 --- a/src/NotificationConfiguration.Test/NotificationConfiguration.Test.csproj +++ b/src/NotificationConfiguration.Test/NotificationConfiguration.Test.csproj @@ -1,74 +1,17 @@ - - - - - - - Debug - AnyCPU - {C7499D7B-015F-47E3-95EA-ED16794D1319} - Library - Properties - Coscine.NotificationConfiguration.Test - Coscine.NotificationConfiguration.Test - v4.6.1 - 512 - true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - - - - - {F17D5354-2FC3-4E57-B06B-EB8C2A307DB2} - NotificationConfiguration - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + Library + Coscine.NotificationConfiguration.Test + Coscine.NotificationConfiguration.Test + net5.0;net461 + + + + + + + + + + \ No newline at end of file diff --git a/src/NotificationConfiguration.Test/Properties/AssemblyInfo.cs b/src/NotificationConfiguration.Test/Properties/AssemblyInfo.cs index 179507f..02401e3 100644 --- a/src/NotificationConfiguration.Test/Properties/AssemblyInfo.cs +++ b/src/NotificationConfiguration.Test/Properties/AssemblyInfo.cs @@ -5,12 +5,5 @@ //------------------------------------------------------------------------------ using System.Reflection; -[assembly: AssemblyTitle("NotificationConfiguration.Test")] [assembly: AssemblyDescription("NotificationConfiguration.Test is a part of the CoScInE group.")] -[assembly: AssemblyCompany("IT Center, RWTH Aachen University")] -[assembly: AssemblyProduct("NotificationConfiguration.Test")] -[assembly: AssemblyVersion("1.5.0")] -[assembly: AssemblyFileVersion("1.5.0")] -[assembly: AssemblyInformationalVersion("1.5.0-topic-1163-admin0001")] -[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] - +[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")] diff --git a/src/NotificationConfiguration.Test/packages.config b/src/NotificationConfiguration.Test/packages.config deleted file mode 100644 index 0ba7006..0000000 --- a/src/NotificationConfiguration.Test/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/NotificationConfiguration/NotificationConfiguration.csproj b/src/NotificationConfiguration/NotificationConfiguration.csproj index 3ed9869..de75948 100644 --- a/src/NotificationConfiguration/NotificationConfiguration.csproj +++ b/src/NotificationConfiguration/NotificationConfiguration.csproj @@ -1,73 +1,27 @@ - - - - - Debug - AnyCPU - {F17D5354-2FC3-4E57-B06B-EB8C2A307DB2} - Library - Properties - Coscine.NotificationConfiguration - Coscine.NotificationConfiguration - v4.6.1 - 512 - true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - - + + + Library + Coscine.NotificationConfiguration + Coscine.NotificationConfiguration + net5.0;net461 + + + + + + true + + + true + + + true + + + true + + + + + \ No newline at end of file diff --git a/src/NotificationConfiguration/Properties/AssemblyInfo.cs b/src/NotificationConfiguration/Properties/AssemblyInfo.cs index 8fc2854..bed5318 100644 --- a/src/NotificationConfiguration/Properties/AssemblyInfo.cs +++ b/src/NotificationConfiguration/Properties/AssemblyInfo.cs @@ -5,12 +5,6 @@ //------------------------------------------------------------------------------ using System.Reflection; -[assembly: AssemblyTitle("NotificationConfiguration")] [assembly: AssemblyDescription("NotificationConfiguration is a part of the CoScInE group.")] -[assembly: AssemblyCompany("IT Center, RWTH Aachen University")] -[assembly: AssemblyProduct("NotificationConfiguration")] -[assembly: AssemblyVersion("1.5.0")] -[assembly: AssemblyFileVersion("1.5.0")] -[assembly: AssemblyInformationalVersion("1.5.0-topic-1163-admin0001")] -[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")] +[assembly: AssemblyCopyright("2021 IT Center, RWTH Aachen University")] diff --git a/src/NotificationConfiguration/packages.config b/src/NotificationConfiguration/packages.config deleted file mode 100644 index 8ab13a9..0000000 --- a/src/NotificationConfiguration/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tools/packages.config b/tools/packages.config deleted file mode 100644 index 8bfcb25..0000000 --- a/tools/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - -- GitLab