diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..1ff0c423042b46cb1d617b81efb715defbe8054d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln merge=binary
+#*.csproj merge=binary
+#*.vbproj merge=binary
+#*.vcxproj merge=binary
+#*.vcproj merge=binary
+#*.dbproj merge=binary
+#*.fsproj merge=binary
+#*.lsproj merge=binary
+#*.wixproj merge=binary
+#*.modelproj merge=binary
+#*.sqlproj merge=binary
+#*.wwaproj merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg binary
+#*.png binary
+#*.gif binary
+
+###############################################################################
+# diff behavior for common document formats
+#
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the
+# entries below.
+###############################################################################
+#*.doc diff=astextplain
+#*.DOC diff=astextplain
+#*.docx diff=astextplain
+#*.DOCX diff=astextplain
+#*.dot diff=astextplain
+#*.DOT diff=astextplain
+#*.pdf diff=astextplain
+#*.PDF diff=astextplain
+#*.rtf diff=astextplain
+#*.RTF diff=astextplain
diff --git a/.gitignore b/.gitignore
index 363c7b2ec0283c1fb1b2d1d239fe573caffc5663..7cdf465cdfbcae98eaca0ef127878a9b08936ec9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
+# Database connection for t4 class generation from database
+**/*.generated.cs
+
# Build results
[Dd]ebug/
[Dd]ebugPublic/
@@ -21,6 +24,7 @@ bld/
[Bb]in/
[Oo]bj/
[Ll]og/
+[Pp]roperties/
# Visual Studio 2015 cache/options directory
.vs/
@@ -265,3 +269,6 @@ __pycache__/
tools/*
!tools/packages.config
dist/
+
+# Dotnet Tool Manifest
+.config/*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b339a45c43a1dcb4b80ab99e6224bc7232abd723..1f871ad9a9c7716e74994e1c2ae4728d2b157445 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,55 +1,23 @@
+include:
+ - project: coscine/tools/gitlab-ci-templates
+ file:
+ - /dotnet.yml
+
stages:
- - test
- - release
- - releasetrigger
+ - build
+ - publish
-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
+variables:
+ DOTNET_MAIN_PROJECT_FOLDER: "UserImporter"
-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
+build-branch:
+ extends: .build-branch
-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
+build-nuget-release:
+ extends: .build-nuget-release
-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-gitlab-release:
+ extends: .publish-gitlab-release
+
+publish:
+ extends: .publish-artifact-release
diff --git a/.releaserc b/.releaserc
deleted file mode 100644
index 72ff2701baf27f6738b07f990506607bcc8dd562..0000000000000000000000000000000000000000
--- a/.releaserc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "plugins": [
- ["@semantic-release/commit-analyzer", {
- "preset": "eslint"
- }],
- ["@semantic-release/release-notes-generator", {
- "preset": "eslint",
- }],
- ["@semantic-release/gitlab", {
- "preset": "eslint",
- "gitlabUrl": "https://git.rwth-aachen.de"
- }],
- ["@semantic-release/exec", {
- "prepareCmd" : "echo ${nextRelease.version}",
- "publishCmd" : "echo test"
- }],
- ["@semantic-release/git", {
- "preset": "eslint",
- "assets": "src/**/Properties/AssemblyInfo.cs",
- "message": "Chore: ${nextRelease.version}\n\n${nextRelease.notes}"
- }]
- ]
-}
diff --git a/GitVersion.yml b/GitVersion.yml
deleted file mode 100644
index 1bdc0fe219f5f35d8a024a66d9fd715f44539640..0000000000000000000000000000000000000000
--- a/GitVersion.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-mode: ContinuousDeployment
-next-version: 1.0.0
-major-version-bump-message: 'Breaking:'
-minor-version-bump-message: '(Update|New):'
-patch-version-bump-message: 'Fix:'
-no-bump-message: '.*'
-commit-message-incrementing: Enabled
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 028e1445d83a05b6d68027507edb53033ca40ac3..cf01721abad453096ac0f01a448e91ed1309a3ef 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2020 RWTH Aachen University
+Copyright (c) 2022 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
@@ -18,4 +18,4 @@ 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.
\ No newline at end of file
+SOFTWARE.
diff --git a/README.md b/README.md
index d25f7759fba070f60e96ac1cba83f5eed6333115..7a2abc45e80a2823bb7e89656717c4bd4d354602 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-# UserImporter
+# User Importer
-This project handles the scheduled user import.
\ No newline at end of file
+This project handles the scheduled user import.
diff --git a/build.cake b/build.cake
deleted file mode 100644
index 81648ff61bbee492e1bc7b4390eb8e0cc33d3056..0000000000000000000000000000000000000000
--- 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<string>("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<DirectoryPath>();
-
- 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<string>{ 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<string> redirectedStandardOutput;
- var exitCodeWithArgument =
- StartProcess(
- "git",
- new ProcessSettings {
- Arguments = $"log {logParam} --pretty=format:HASH%h:%B",
- RedirectStandardOutput = true
- },
- out redirectedStandardOutput
- );
-
- var prefixList = new Dictionary<string, List<string>>{
- {"Fix", new List<string>()},
- {"Update", new List<string>()},
- {"New", new List<string>()},
- {"Breaking", new List<string>()},
- {"Docs", new List<string>()},
- {"Build", new List<string>()},
- {"Upgrade", new List<string>()},
- {"Chore", new List<string>()},
- };
-
- 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<string, string>
- {
- { "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 7f1f813d74cf6c0826517482757c38b86e0467b3..0000000000000000000000000000000000000000
--- a/build.ps1
+++ /dev/null
@@ -1,256 +0,0 @@
-##########################################################################
-# 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 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]$SkipToolPackageRestore,
- [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
- [string[]]$ScriptArgs
-)
-
-# Attempt to set highest encryption available for SecurityProtocol.
-# PowerShell will not set this by default (until maybe .NET 4.6.x). This
-# will typically produce a message for PowerShell v2 (just an info
-# message though)
-try {
- # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48)
- # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't
- # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is
- # installed (.NET 4.5 is an in-place upgrade).
- # PowerShell Core already has support for TLS 1.2 so we can skip this if running in that.
- if (-not $IsCoreCLR) {
- [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48
- }
- } catch {
- Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3'
- }
-
-[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
-$env:NUGET_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) {
- "mono `"$NUGET_EXE`""
-} else {
- "`"$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..."
- Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery |
- Remove-Item -Recurse
- }
-
- Write-Verbose -Message "Restoring tools from NuGet..."
-
- $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION 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 "& $env:NUGET_EXE_INVOCATION 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 "& $env:NUGET_EXE_INVOCATION 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"
-}
-
-$CAKE_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) {
- "mono `"$CAKE_EXE`""
-} else {
- "`"$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" }
-$cakeArguments += $ScriptArgs
-
-# Start Cake
-Write-Host "Running build script..."
-Invoke-Expression "& $CAKE_EXE_INVOCATION $($cakeArguments -join " ")"
-exit $LASTEXITCODE
diff --git a/build.sh b/build.sh
deleted file mode 100644
index d088917ed78538ff57cf654cf71aad6bf045d655..0000000000000000000000000000000000000000
--- 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/nunit3-junit.xslt b/nunit3-junit.xslt
deleted file mode 100644
index bf69bdb1d2cd6fc2fdbeb915b4eb6732f720848e..0000000000000000000000000000000000000000
--- a/nunit3-junit.xslt
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Taken from: https://github.com/nunit/nunit-transforms/tree/master/nunit3-junit
--->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:template match="/test-run">
- <testsuites tests="{@testcasecount}" failures="{@failed}" disabled="{@skipped}" time="{@duration}">
- <xsl:apply-templates/>
- </testsuites>
- </xsl:template>
-
- <xsl:template match="test-suite">
- <xsl:if test="test-case">
- <testsuite tests="{@testcasecount}" time="{@duration}" errors="{@testcasecount - @passed - @skipped - @failed}" failures="{@failed}" skipped="{@skipped}" timestamp="{@start-time}">
- <xsl:attribute name="name">
- <xsl:for-each select="ancestor-or-self::test-suite/@name">
- <xsl:value-of select="concat(., '.')"/>
- </xsl:for-each>
- </xsl:attribute>
- <xsl:apply-templates select="test-case"/>
- </testsuite>
- <xsl:apply-templates select="test-suite"/>
- </xsl:if>
- <xsl:if test="not(test-case)">
- <xsl:apply-templates/>
- </xsl:if>
- </xsl:template>
-
- <xsl:template match="test-case">
- <testcase name="{@name}" assertions="{@asserts}" time="{@duration}" status="{@result}" classname="{@classname}">
- <xsl:if test="@runstate = 'Skipped' or @runstate = 'Ignored'">
- <skipped/>
- </xsl:if>
-
- <xsl:apply-templates/>
- </testcase>
- </xsl:template>
-
- <xsl:template match="command-line"/>
- <xsl:template match="settings"/>
-
- <xsl:template match="output">
- <system-out>
- <xsl:value-of select="."/>
- </system-out>
- </xsl:template>
-
- <xsl:template match="stack-trace">
- </xsl:template>
-
- <xsl:template match="test-case/failure">
- <failure message="{./message}">
- <xsl:value-of select="./stack-trace"/>
- </failure>
- </xsl:template>
-
- <xsl:template match="test-suite/failure"/>
-
- <xsl:template match="test-case/reason">
- <skipped message="{./message}"/>
- </xsl:template>
-
- <xsl:template match="test-case/assertions">
- </xsl:template>
-
- <xsl:template match="test-suite/reason"/>
-
- <xsl:template match="properties"/>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/UserImporter.sln b/src/UserImporter.sln
index 877ab28fd6d2010a98f815ec36f3551cede4564f..fd627aa53ef8019470ae9ca3f4134131fbdc4bf3 100644
--- a/src/UserImporter.sln
+++ b/src/UserImporter.sln
@@ -1,9 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30320.27
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33122.133
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserImporter", "UserImporter\UserImporter.csproj", "{50385C55-9CD9-4401-91EF-A8FD7145D7B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UserImporter", "UserImporter\UserImporter.csproj", "{50385C55-9CD9-4401-91EF-A8FD7145D7B0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/UserImporter/App.config b/src/UserImporter/App.config
deleted file mode 100644
index 66c4ffc40586323199b74ef70c798a8504adc87a..0000000000000000000000000000000000000000
--- a/src/UserImporter/App.config
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <configSections>
- <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
- <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
- </configSections>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
- </startup>
- <entityFramework>
- <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
- <parameters>
- <parameter value="mssqllocaldb" />
- </parameters>
- </defaultConnectionFactory>
- <providers>
- <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
- </providers>
- </entityFramework>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="Coscine.Configuration" publicKeyToken="ce3d7a32d7dc1e5a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.6.0.0" newVersion="1.6.0.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.28.0.0" newVersion="1.28.0.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="linq2db" publicKeyToken="e41013125f9e410a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-3.2.3.0" newVersion="3.2.3.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="Coscine.Database.T4" publicKeyToken="84b4c404a0696261" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.28.0.0" newVersion="1.28.0.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="LinqKit" publicKeyToken="bc217f8844052a91" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.1.22.0" newVersion="1.1.22.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.11.29.0" newVersion="1.11.29.0" />
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
-</configuration>
\ No newline at end of file
diff --git a/src/UserImporter/Program.cs b/src/UserImporter/Program.cs
index a8ed1052d64148fdd42a11587acaf7aca72f5dc4..82e4fddfcba85196e3652dfd1bd357b1fd6650c7 100644
--- a/src/UserImporter/Program.cs
+++ b/src/UserImporter/Program.cs
@@ -1,25 +1,23 @@
-using Coscine.Configuration;
+using Coscine.ActiveDirectory;
+using Coscine.Configuration;
+using Coscine.Database.DataModel;
using Coscine.Database.Models;
using Coscine.Metadata;
using System;
-using System.Linq;
using System.Collections.Generic;
+using System.Linq;
using VDS.RDF;
using VDS.RDF.Query;
using VDS.RDF.Query.Builder;
using VDS.RDF.Storage;
using VDS.RDF.Update;
-using Coscine.Database.DataModel;
-using Coscine.ActiveDirectory;
-using LinqToDB.Data;
-using Coscine.Database.Settings;
namespace Coscine.UserImporter
{
public class Program
{
- private static Dictionary<string, string> RORMap = new Dictionary<string, string>()
+ private static readonly Dictionary<string, string> RORMap = new()
{
{ "https://ror.org/04xfq0f34", "https://login.rz.rwth-aachen.de/shibboleth" },
};
@@ -27,7 +25,6 @@ namespace Coscine.UserImporter
public static void Main(string[] args)
{
var configuration = new ConsulConfiguration();
- DataConnection.DefaultSettings = new CoscineSettings(configuration);
var virtuosoServer = configuration.GetString("coscine/local/virtuoso/additional/url");
using (var rdfStoreConnector = new RdfStoreConnector(virtuosoServer))
@@ -42,78 +39,73 @@ namespace Coscine.UserImporter
var queryEndpoint = new SparqlRemoteEndpoint(new Uri(string.Format(virtuosoServer)));
var readWriteSparqlConnector = new ReadWriteSparqlConnector(queryEndpoint, updateEndpoint);
- var graphs = readWriteSparqlConnector.ListGraphs();
+ var graphUris = RORMap.Keys.Select((entry) => new Uri(entry));
- foreach (var graph in graphs)
+ foreach (var graphUri in graphUris)
{
- var absoluteUri = graph.AbsoluteUri;
- if (absoluteUri.StartsWith("https://ror.org/"))
+ SparqlResultSet pers = null;
+ var offset = 0;
+ var graphImpl = new Graph
{
- SparqlResultSet pers = null;
- var offset = 0;
- var graphImpl = new Graph
- {
- BaseUri = graph
- };
+ BaseUri = graphUri
+ };
- // Get all users from the current graph which are a person
- // The graph is queried in a batch of 5000 entries since there seems to be a hard limit on 10000 entries per request
- do
+ // Get all users from the current graph which are a person
+ // The graph is queried in a batch of 5000 entries since there seems to be a hard limit on 10000 entries per request
+ do
+ {
+ var query = QueryBuilder.Select(new SparqlVariable("s"), new SparqlVariable("p"), new SparqlVariable("o"))
+ .Graph(graphUri, graphEntry => graphEntry
+ .Where((where) => where.Subject("s").Predicate("p").Object("o"))
+ .Where((where) => where.Subject("s")
+ .PredicateUri(new Uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"))
+ .Object(new Uri("http://xmlns.com/foaf/0.1/Person"))))
+ .Limit(5000)
+ .Offset(offset)
+ .BuildQuery();
+
+ pers = (SparqlResultSet)readWriteSparqlConnector.Query(query.ToString());
+ foreach (var res in pers.Results)
{
- var query = QueryBuilder.Select(new SparqlVariable("s"), new SparqlVariable("p"), new SparqlVariable("o"))
- .Graph(graph, graphEntry => graphEntry
- .Where((where) => where.Subject("s").Predicate("p").Object("o"))
- .Where((where) => where.Subject("s")
- .PredicateUri(new Uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"))
- .Object(new Uri("http://xmlns.com/foaf/0.1/Person"))))
- .Limit(5000)
- .Offset(offset)
- .BuildQuery();
-
-
- pers = (SparqlResultSet)readWriteSparqlConnector.Query(query.ToString());
- foreach (var res in pers.Results)
- {
- graphImpl.Assert(res.Value("s"), res.Value("p"), res.Value("o"));
- }
+ graphImpl.Assert(res.Value("s"), res.Value("p"), res.Value("o"));
+ }
- offset += 5000;
- } while (pers.Count > 0);
+ offset += 5000;
+ } while (pers.Count > 0);
- var rdfType = graphImpl.CreateUriNode(new Uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"));
- var person = graphImpl.CreateUriNode(new Uri("http://xmlns.com/foaf/0.1/Person"));
- var openId = graphImpl.CreateUriNode(new Uri("http://xmlns.com/foaf/0.1/openId"));
+ var rdfType = graphImpl.CreateUriNode(new Uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"));
+ var person = graphImpl.CreateUriNode(new Uri("http://xmlns.com/foaf/0.1/Person"));
+ var openId = graphImpl.CreateUriNode(new Uri("http://xmlns.com/foaf/0.1/openId"));
- var createdUsers = 0;
+ var createdUsers = 0;
- foreach (var entry in graphImpl.GetTriplesWithPredicateObject(rdfType, person))
+ foreach (var entry in graphImpl.GetTriplesWithPredicateObject(rdfType, person))
+ {
+ foreach (var triple in graphImpl.GetTriplesWithSubjectPredicate(entry.Subject, openId))
{
- foreach (var triple in graphImpl.GetTriplesWithSubjectPredicate(entry.Subject, openId))
+ if (!externalIdModel.GetAllWhere((externalId) =>
+ externalId.ExternalId1 == triple.Object.ToString()
+ && externalId.ExternalAuthenticatorId == shib.Id).Any())
{
- if (externalIdModel.GetAllWhere((externalId) =>
- externalId.ExternalIdColumn == triple.Object.ToString()
- && externalId.ExternalAuthenticatorId == shib.Id).Count() == 0)
+ try
{
- try
- {
- var user = CreateUserObjectFromGraph(graphImpl, entry.Subject);
- StoreUser(configuration, externalIdModel, userModel, shib, triple.Object.ToString(), user, absoluteUri);
- createdUsers++;
- if (createdUsers%100 == 0)
- {
- Console.WriteLine("Created " + createdUsers + " users.");
- }
- }
- catch (Exception)
+ var user = CreateUserObjectFromGraph(graphImpl, entry.Subject);
+ StoreUser(configuration, externalIdModel, userModel, shib, triple.Object.ToString(), user, graphUri.AbsoluteUri);
+ createdUsers++;
+ if (createdUsers % 100 == 0)
{
- Console.WriteLine("Error on " + entry.Subject.ToString());
+ Console.WriteLine("Created " + createdUsers + " users.");
}
}
+ catch (Exception)
+ {
+ Console.WriteLine("Error on " + entry.Subject.ToString());
+ }
}
}
-
- Console.WriteLine($"Finish: Created {createdUsers} users for {graph}");
}
+
+ Console.WriteLine($"Finish: Created {createdUsers} users for {graphUri}");
}
}
}
@@ -123,7 +115,7 @@ namespace Coscine.UserImporter
userModel.Insert(user);
externalIdModel.Insert(new ExternalId
{
- ExternalIdColumn = externalId,
+ ExternalId1 = externalId,
ExternalAuthenticatorId = shib.Id,
Organization = RORMap.ContainsKey(absoluteUri) ? RORMap[absoluteUri] : "",
UserId = user.Id
@@ -146,7 +138,7 @@ namespace Coscine.UserImporter
{
var predicate = graphImpl.CreateUriNode(kv.Key);
var triples = graphImpl.GetTriplesWithSubjectPredicate(subject, predicate);
- if (triples.Count() > 0)
+ if (triples.Any())
{
kv.Value(user, triples.First().Object.ToString());
}
diff --git a/src/UserImporter/Properties/AssemblyInfo.cs b/src/UserImporter/Properties/AssemblyInfo.cs
deleted file mode 100644
index eb81912fac1d8bc3b894b1df0afee10747defb68..0000000000000000000000000000000000000000
--- a/src/UserImporter/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using 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.
-[assembly: AssemblyTitle("UserImporter")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("UserImporter")]
-[assembly: AssemblyCopyright("Copyright © 2020")]
-[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
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("50385c55-9cd9-4401-91ef-a8fd7145d7b0")]
-
-// 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:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/UserImporter/UserImporter.csproj b/src/UserImporter/UserImporter.csproj
index b7065955f25c45e1a47261c85ab7aa0ccfc0de96..6f5e7c054073f910bdbf15d870811e90a9af5261 100644
--- a/src/UserImporter/UserImporter.csproj
+++ b/src/UserImporter/UserImporter.csproj
@@ -1,171 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\packages\linq2db.t4models.3.2.3\build\linq2db.t4models.props" Condition="Exists('..\packages\linq2db.t4models.3.2.3\build\linq2db.t4models.props')" />
- <Import Project="..\packages\linq2db.SqlServer.3.2.3\build\linq2db.SqlServer.props" Condition="Exists('..\packages\linq2db.SqlServer.3.2.3\build\linq2db.SqlServer.props')" />
- <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{50385C55-9CD9-4401-91EF-A8FD7145D7B0}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Coscine.UserImporter</RootNamespace>
<AssemblyName>Coscine.UserImporter</AssemblyName>
- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
+ <TargetFramework>net6.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <Deterministic>true</Deterministic>
- <NuGetPackageImportStamp>
- </NuGetPackageImportStamp>
+ <AssemblyTitle>UserImporter</AssemblyTitle>
+ <Product>UserImporter</Product>
+ <Copyright>Copyright © 2022</Copyright>
+ <OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Consul, Version=1.6.1.1, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL">
- <HintPath>..\packages\Consul.1.6.1.1\lib\net461\Consul.dll</HintPath>
- </Reference>
- <Reference Include="Coscine.ActiveDirectory, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Coscine.ActiveDirectory.1.4.0\lib\net461\Coscine.ActiveDirectory.dll</HintPath>
- </Reference>
- <Reference Include="Coscine.Configuration, Version=1.6.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL">
- <HintPath>..\packages\Coscine.Configuration.1.6.0\lib\net461\Coscine.Configuration.dll</HintPath>
- </Reference>
- <Reference Include="Coscine.Database, Version=1.28.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
- <HintPath>..\packages\Coscine.Database.1.28.0\lib\net461\Coscine.Database.dll</HintPath>
- </Reference>
- <Reference Include="Coscine.Database.T4, Version=1.28.0.0, Culture=neutral, PublicKeyToken=84b4c404a0696261, processorArchitecture=MSIL">
- <HintPath>..\packages\Coscine.Database.1.28.0\lib\net461\Coscine.Database.T4.dll</HintPath>
- </Reference>
- <Reference Include="Coscine.Metadata, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Coscine.Metadata.1.6.0\lib\net461\Coscine.Metadata.dll</HintPath>
- </Reference>
- <Reference Include="dotNetRDF, Version=2.6.1.0, Culture=neutral, PublicKeyToken=6055ffe4c97cc780, processorArchitecture=MSIL">
- <HintPath>..\packages\dotNetRDF.2.6.1\lib\net40\dotNetRDF.dll</HintPath>
- </Reference>
- <Reference Include="dotNetRDF.Data.Virtuoso, Version=2.6.1.0, Culture=neutral, PublicKeyToken=6055ffe4c97cc780, processorArchitecture=MSIL">
- <HintPath>..\packages\dotNetRDF.Data.Virtuoso.2.6.1\lib\net40\dotNetRDF.Data.Virtuoso.dll</HintPath>
- </Reference>
- <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
- </Reference>
- <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
- </Reference>
- <Reference Include="HtmlAgilityPack, Version=1.11.29.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
- <HintPath>..\packages\HtmlAgilityPack.1.11.29\lib\Net45\HtmlAgilityPack.dll</HintPath>
- </Reference>
- <Reference Include="linq2db, Version=3.2.3.0, Culture=neutral, PublicKeyToken=e41013125f9e410a, processorArchitecture=MSIL">
- <HintPath>..\packages\linq2db.3.2.3\lib\net46\linq2db.dll</HintPath>
- </Reference>
- <Reference Include="LinqKit, Version=1.1.22.0, Culture=neutral, PublicKeyToken=bc217f8844052a91, processorArchitecture=MSIL">
- <HintPath>..\packages\LinqKit.1.1.22\lib\net45\LinqKit.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Core" />
- <Reference Include="System.DirectoryServices" />
- <Reference Include="System.Net.Http.WebRequest" />
- <Reference Include="System.Security" />
- <Reference Include="System.Web" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Xml" />
- <Reference Include="VDS.Common, Version=1.10.0.0, Culture=neutral, PublicKeyToken=ab5f4eb908061bf0, processorArchitecture=MSIL">
- <HintPath>..\packages\VDS.Common.1.10.0\lib\net40-client\VDS.Common.dll</HintPath>
- </Reference>
- <Reference Include="virtado4, Version=4.0.0.0, Culture=neutral, PublicKeyToken=391bf132017ae989, processorArchitecture=MSIL">
- <HintPath>..\packages\OpenLink.Data.Virtuoso.7.20.3214.1\lib\net40\virtado4.dll</HintPath>
- </Reference>
+ <PackageReference Include="Coscine.ActiveDirectory" Version="2.*-*" />
+ <PackageReference Include="Coscine.Configuration" Version="2.*-*" />
+ <PackageReference Include="Coscine.Database" Version="2.*-*" />
+ <PackageReference Include="Coscine.Metadata" Version="2.*-*" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
+ <Folder Include="Properties\" />
</ItemGroup>
- <ItemGroup>
- <None Include="amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
- <None Include="App.config" />
- <None Include="LinqToDB.Templates\DataAnnotations.ttinclude" />
- <None Include="LinqToDB.Templates\DataModel.ttinclude" />
- <None Include="LinqToDB.Templates\EditableObject.ttinclude" />
- <None Include="LinqToDB.Templates\Equatable.ttinclude" />
- <None Include="LinqToDB.Templates\Humanizer.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Access.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Access.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.DB2.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.DB2.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Firebird.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Firebird.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Informix.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Informix.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.MySql.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.MySql.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Oracle.Managed.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Oracle.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Oracle.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Oracle.x64.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Oracle.x86.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.PostgreSQL.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.PostgreSQL.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SapHana.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SapHana.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SqlCe.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SqlCe.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SQLite.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SQLite.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SqlServer.SqlTypes.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SqlServer.SqlTypes.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SqlServer.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.SqlServer.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Sybase.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Sybase.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.Tools.ttinclude" />
- <None Include="LinqToDB.Templates\LinqToDB.ttinclude" />
- <None Include="LinqToDB.Templates\MultipleFiles.ttinclude" />
- <None Include="LinqToDB.Templates\NotifyDataErrorInfo.ttinclude" />
- <None Include="LinqToDB.Templates\NotifyPropertyChanged.ttinclude" />
- <None Include="LinqToDB.Templates\ObsoleteAttributes.ttinclude" />
- <None Include="LinqToDB.Templates\PluralizationService.ttinclude" />
- <None Include="LinqToDB.Templates\README.md" />
- <None Include="LinqToDB.Templates\T4Model.ttinclude" />
- <None Include="LinqToDB.Templates\Validation.ttinclude" />
- <None Include="packages.config" />
- <None Include="x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>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}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
- <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
- <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
- <Error Condition="!Exists('..\packages\linq2db.SqlServer.3.2.3\build\linq2db.SqlServer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\linq2db.SqlServer.3.2.3\build\linq2db.SqlServer.props'))" />
- <Error Condition="!Exists('..\packages\linq2db.t4models.3.2.3\build\linq2db.t4models.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\linq2db.t4models.3.2.3\build\linq2db.t4models.props'))" />
- </Target>
- <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
- <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
</Project>
\ No newline at end of file
diff --git a/src/UserImporter/packages.config b/src/UserImporter/packages.config
deleted file mode 100644
index 31fd903990a0e38576beecafa7affd9a0e0a1a5a..0000000000000000000000000000000000000000
--- a/src/UserImporter/packages.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Consul" version="1.6.1.1" targetFramework="net461" />
- <package id="Coscine.ActiveDirectory" version="1.4.0" targetFramework="net461" />
- <package id="Coscine.Configuration" version="1.6.0" targetFramework="net461" />
- <package id="Coscine.Database" version="1.28.0" targetFramework="net461" />
- <package id="Coscine.Metadata" version="1.6.0" targetFramework="net461" />
- <package id="dotNetRDF" version="2.6.1" targetFramework="net461" />
- <package id="dotNetRDF.Data.Virtuoso" version="2.6.1" targetFramework="net461" />
- <package id="EntityFramework" version="6.4.4" targetFramework="net461" />
- <package id="HtmlAgilityPack" version="1.11.29" targetFramework="net461" />
- <package id="linq2db" version="3.2.3" targetFramework="net461" />
- <package id="linq2db.SqlServer" version="3.2.3" targetFramework="net461" />
- <package id="linq2db.t4models" version="3.2.3" targetFramework="net461" />
- <package id="LinqKit" version="1.1.22" targetFramework="net461" />
- <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
- <package id="OpenLink.Data.Virtuoso" version="7.20.3214.1" targetFramework="net461" />
- <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net461" />
- <package id="System.DirectoryServices" version="5.0.0" targetFramework="net461" />
- <package id="VDS.Common" version="1.10.0" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/tools/packages.config b/tools/packages.config
deleted file mode 100644
index 14aef3bf00189e621993b61ccea2e4a203e73b9b..0000000000000000000000000000000000000000
--- a/tools/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Cake" version="0.36.0" />
-</packages>