From 28fdcf4c26d1df1f4053b11b9c95e035ac81b919 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 17:03:20 +0000 Subject: [PATCH 1/3] Bump NUnit3TestAdapter from 4.3.0 to 4.3.1 Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases) - [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V4.3.0...V4.3.1) --- updated-dependencies: - dependency-name: NUnit3TestAdapter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Tests/Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 1855601..df6e7f0 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -23,7 +23,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 586ee72d1eb36e0b93bbad62a4d0908d1624c003 Mon Sep 17 00:00:00 2001 From: James A Sutherland <> Date: Mon, 21 Nov 2022 15:44:33 -0600 Subject: [PATCH 2/3] Remove tznind from Dependabot config --- .github/dependabot.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ba58abf..6dc2d79 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,5 +15,4 @@ updates: interval: "daily" target-branch: develop reviewers: - - tznind - jas88 From 9a8bb83434089ca5121db56c2bb56edbd250eac4 Mon Sep 17 00:00:00 2001 From: James A Sutherland <> Date: Mon, 21 Nov 2022 15:46:29 -0600 Subject: [PATCH 3/3] Remove obsolete Rake files --- rakeconfig.rb | 14 ------- rakefile.rb | 106 -------------------------------------------------- 2 files changed, 120 deletions(-) delete mode 100644 rakeconfig.rb delete mode 100644 rakefile.rb diff --git a/rakeconfig.rb b/rakeconfig.rb deleted file mode 100644 index ed798d2..0000000 --- a/rakeconfig.rb +++ /dev/null @@ -1,14 +0,0 @@ -PUBLISH_DIR = ENV['PUBLISH_DIR'] || "Release" -SOLUTION = ENV['SOLUTION'] || "TemplateBuilder.sln" -DBSERVER = ENV['DBSERVER'] || "localhost\\sqlexpress" -DBPREFIX = ENV['DBPREFIX'] || "TEST_" -MYSQLDB = ENV['MYSQLDB'] || "adp-hicci-03" -MYSQLUSR = ENV['MYSQLUSR'] || "hicci" -MYSQLPASS= ENV['MYSQLPASS'] || "killerzombie" -PRERELEASE = ENV['PRERELEASE'] || "false" -CANDIDATE = ENV['CANDIDATE'] || "false" -SUFFIX = ENV['SUFFIX'] || "develop" -NUGETKEY = ENV['NUGETKEY'] || "blahblahblahbroken!" -MSBUILD15CMD = ENV['MSBUILD15CMD'] || "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/MSBuild/Current/Bin/msbuild.exe" -SQUIRREL = ENV['SQUIRREL'] || "C:/Users/ltramma/.nuget/packages/squirrel.windows/1.9.1/tools" -GITHUB = ENV['GITHUB'] || "4d286e77faef2f148c74a93c2666e948c48080f7" \ No newline at end of file diff --git a/rakefile.rb b/rakefile.rb deleted file mode 100644 index 6b206b3..0000000 --- a/rakefile.rb +++ /dev/null @@ -1,106 +0,0 @@ -require "net/http" -require 'uri' -require 'json' - -load 'rakeconfig.rb' -$MSBUILD15CMD = MSBUILD15CMD.gsub(/\\/,"/") - -task :release => [:assemblyinfo, :build_release, :github] - -task :restorepackages do - sh "nuget restore #{SOLUTION}" -end - -task :build, [:config] => :restorepackages do |msb, args| - sh "\"#{$MSBUILD15CMD}\" #{SOLUTION} \/t:Clean;Build \/p:Configuration=#{args.config}" -end - - -task :build_release => :restorepackages do - Dir.chdir("TemplateBuilder/") do - sh "\"#{$MSBUILD15CMD}\" TemplateBuilder.csproj \/t:Publish \/p:Configuration=Release;RuntimeIdentifiers=win-x64" - - Dir.chdir("bin/Release/net461/publish/") do - sh "#{SQUIRREL}/signtool.exe sign /a /s MY /n \"University of Dundee\" /fd sha256 /tr http://timestamp.digicert.com /td sha256 /v *.dll" - sh "#{SQUIRREL}/signtool.exe sign /a /s MY /n \"University of Dundee\" /fd sha256 /tr http://timestamp.digicert.com /td sha256 /v *.exe" - end - - end - sh "powershell.exe -nologo -noprofile -command \"& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('TemplateBuilder/bin/Release/net461/publish', 'TemplateBuilder/templatebuilder-win-x64.zip'); }\"" -end - -desc "Sets the version number from SharedAssemblyInfo file" -task :assemblyinfo do - asminfoversion = File.read("SharedAssemblyInfo.cs").match(/AssemblyInformationalVersion\("(\d+)\.(\d+)\.(\d+)(-.*)?"/) - - puts asminfoversion.inspect - - major = asminfoversion[1] - minor = asminfoversion[2] - patch = asminfoversion[3] - suffix = asminfoversion[4] - - version = "#{major}.#{minor}.#{patch}" - puts "version: #{version}#{suffix}" - - # DO NOT REMOVE! needed by build script! - f = File.new('version', 'w') - f.write "#{version}#{suffix}" - f.close - # ---- -end - - -task :github do - version = File.open('version') {|f| f.readline} - puts "version: #{version}" - branch = (ENV['BRANCH_SELECTOR'] || "origin/release/3.0.0.X").gsub(/origin\//, "") - puts branch - prerelease = branch.match(/master/) ? false : true - - uri = URI.parse('https://api.github.com/repos/HicServices/DicomTemplateBuilder/releases') - body = { tag_name: "v#{version}", name: "Dicom Template Builder v#{version}", body: ENV['MESSAGE'] || "Release version #{version}", target_commitish: branch, prerelease: prerelease } - header = {'Content-Type' => 'application/json', - 'Authorization' => "token #{GITHUB}"} - - http = Net::HTTP.new(uri.host, uri.port) - http.use_ssl = (uri.scheme == "https") - request = Net::HTTP::Post.new(uri.request_uri, header) - request.body = body.to_json - - # Send the request - response = http.request(request) - puts response.to_hash.inspect - githubresponse = JSON.parse(response.body) - puts githubresponse.inspect - upload_url = githubresponse["upload_url"].gsub(/\{.*\}/, "") - puts upload_url - - Dir.chdir("TemplateBuilder/") do - upload_to_github(upload_url, "templatebuilder-win-x64.zip") - end -end - -def upload_to_github(upload_url, file_path) - boundary = "AaB03x" - uri = URI.parse(upload_url + "?name=" + file_path) - - header = {'Content-Type' => 'application/octet-stream', - 'Content-Length' => File.size(file_path).to_s, - 'Authorization' => "token #{GITHUB}"} - - http = Net::HTTP.new(uri.host, uri.port) - http.use_ssl = (uri.scheme == "https") - request = Net::HTTP::Post.new(uri.request_uri, header) - - file = File.open(file_path, "rb") - request.body = file.read - - response = http.request(request) - - puts response.to_hash.inspect - puts response.body - - file.close -end -