From c8d726326f120e70354997819c1ae34bed1b4fb3 Mon Sep 17 00:00:00 2001 From: timerix Date: Wed, 7 Dec 2022 00:34:06 +0600 Subject: [PATCH] submodules replaced with nuget packages --- .gitignore | 31 ++++++++++++++----- .gitmodules | 3 -- DTLib | 1 - .../VkAudioDownloader.CLI.csproj | 8 +++-- VkAudioDownloader.sln | 27 ++-------------- VkAudioDownloader/VkAudioDownloader.csproj | 30 +++++++++++------- pack.sh | 5 +++ push_packages.sh | 11 +++++++ 8 files changed, 65 insertions(+), 51 deletions(-) delete mode 100644 .gitmodules delete mode 160000 DTLib create mode 100644 pack.sh create mode 100644 push_packages.sh diff --git a/.gitignore b/.gitignore index ee9ec4a..4e7b25a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,23 @@ -bin/ -obj/ -/packages/ -riderModule.iml -/_ReSharper.Caches/ -.idea/ -*.user -*.DotSettings +# Build results +[Bb]in/ +.bin/ +[Dd]ebug/ +[Rr]elease/ +[Rr]eleases/ +[Oo]bj/ +[Oo]ut/ +[Ll]og/ +[Ll]ogs/ +nuget/ + +# IDE files +.vs/ +.vscode/ +.vshistory/ +.idea/ +.editorconfig +*.user +*.DotSettings + +#backups +.old*/ diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e38da3f..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "DTLib"] - path = DTLib - url = https://github.com/Timerix22/DTLib.git diff --git a/DTLib b/DTLib deleted file mode 160000 index e7769a3..0000000 --- a/DTLib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7769a3e0ff8788b5a476c7a9c797f2d6097ad89 diff --git a/VkAudioDownloader.CLI/VkAudioDownloader.CLI.csproj b/VkAudioDownloader.CLI/VkAudioDownloader.CLI.csproj index 3a34438..a87d47b 100644 --- a/VkAudioDownloader.CLI/VkAudioDownloader.CLI.csproj +++ b/VkAudioDownloader.CLI/VkAudioDownloader.CLI.csproj @@ -1,5 +1,4 @@ - Exe net6.0 @@ -9,7 +8,12 @@ - + + + + PreserveNewest + + diff --git a/VkAudioDownloader.sln b/VkAudioDownloader.sln index d70be2f..74372e4 100644 --- a/VkAudioDownloader.sln +++ b/VkAudioDownloader.sln @@ -4,20 +4,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkAudioDownloader", "VkAudi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkAudioDownloader.CLI", "VkAudioDownloader.CLI\VkAudioDownloader.CLI.csproj", "{5ECC83C5-B53F-4CA7-ABDE-E2ACE8F48FED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib", "DTLib\DTLib\DTLib.csproj", "{5A02279F-F246-4101-BAA7-71EC5FAF2CAF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib.Dtsod", "DTLib\DTLib.Dtsod\DTLib.Dtsod.csproj", "{F6FA6507-8A20-43F8-9D88-4CB2F049780D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sulution_items", "sulution_items", "{2CBCAE99-53A3-4ADE-A08B-5755EC471878}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore - .gitmodules = .gitmodules + pack.sh = pack.sh + push_packages.sh = push_packages.sh EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib.Logging", "DTLib\DTLib.Logging\DTLib.Logging.csproj", "{A087B535-371A-4A7E-883E-B5B290567E9A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ben.Demystifier", "DTLib\DTLib.Logging\Ben.Demystifier\src\Ben.Demystifier\Ben.Demystifier.csproj", "{42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -32,21 +25,5 @@ Global {5ECC83C5-B53F-4CA7-ABDE-E2ACE8F48FED}.Debug|Any CPU.Build.0 = Debug|Any CPU {5ECC83C5-B53F-4CA7-ABDE-E2ACE8F48FED}.Release|Any CPU.ActiveCfg = Release|Any CPU {5ECC83C5-B53F-4CA7-ABDE-E2ACE8F48FED}.Release|Any CPU.Build.0 = Release|Any CPU - {5A02279F-F246-4101-BAA7-71EC5FAF2CAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A02279F-F246-4101-BAA7-71EC5FAF2CAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A02279F-F246-4101-BAA7-71EC5FAF2CAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A02279F-F246-4101-BAA7-71EC5FAF2CAF}.Release|Any CPU.Build.0 = Release|Any CPU - {F6FA6507-8A20-43F8-9D88-4CB2F049780D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6FA6507-8A20-43F8-9D88-4CB2F049780D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6FA6507-8A20-43F8-9D88-4CB2F049780D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6FA6507-8A20-43F8-9D88-4CB2F049780D}.Release|Any CPU.Build.0 = Release|Any CPU - {A087B535-371A-4A7E-883E-B5B290567E9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A087B535-371A-4A7E-883E-B5B290567E9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A087B535-371A-4A7E-883E-B5B290567E9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A087B535-371A-4A7E-883E-B5B290567E9A}.Release|Any CPU.Build.0 = Release|Any CPU - {42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/VkAudioDownloader/VkAudioDownloader.csproj b/VkAudioDownloader/VkAudioDownloader.csproj index 48c8869..54e0e75 100644 --- a/VkAudioDownloader/VkAudioDownloader.csproj +++ b/VkAudioDownloader/VkAudioDownloader.csproj @@ -1,23 +1,29 @@ - + + VkAudioDownloader + 0.1.0 + Timerix + Loggers with dependency injection + GIT + https://github.com/Timerix22/VkAudioDownloader + Release + MIT + net6.0 + embedded + 10 - disable enable - true + disable + - - - - - - - - + + + + - diff --git a/pack.sh b/pack.sh new file mode 100644 index 0000000..30e1e67 --- /dev/null +++ b/pack.sh @@ -0,0 +1,5 @@ +#!/usr/bin/bash +set -ex +rm -rf nuget +dotnet pack VkAudioDownloader/VkAudioDownloader.csproj -o ./nuget/ +ls nuget diff --git a/push_packages.sh b/push_packages.sh new file mode 100644 index 0000000..53b6c0e --- /dev/null +++ b/push_packages.sh @@ -0,0 +1,11 @@ +#!/usr/bin/bash + +echo enter github api key: +read -r GHK +echo enter nuget api key: +read -r NGK + +for PACK in $(find ./nuget -name '*.nupkg'); do + dotnet nuget push $PACK -k $GHK -s github --skip-duplicate + dotnet nuget push $PACK -k $NGK -s nuget.org --skip-duplicate +done