diff --git a/Jenkinsfile b/Jenkinsfile index 5083f92..f794a72 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,9 @@ pipeline { } stage("Publish") { steps { - dotnetPublish configuration: 'Release', project: 'Props', selfContained: false, unstableIfWarnings: true + // TODO: Archive things. + dotnetPublish configuration: 'Release', noRestore: true, project: 'Props', runtime: 'win-x64', sdk: 'Default .NET SDK' + dotnetPublish configuration: 'Release', noRestore: true, project: 'Props', runtime: 'linux-x64', sdk: 'Default .NET SDK' } } } diff --git a/Props/Props.csproj b/Props/Props.csproj index 527d3db..73c7ee4 100644 --- a/Props/Props.csproj +++ b/Props/Props.csproj @@ -1,7 +1,16 @@ + + + net6.0 + true + true + true + false + linux-x64 + true aspnet-Props-20A2A991-EC61-4C06-91D2-953482026A7B @@ -31,14 +40,61 @@ + + + + RemoveIdentityAssets + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -48,7 +104,15 @@ - - + + + + + + + + + + \ No newline at end of file diff --git a/scripts/load_shop_modules.py b/scripts/load_shop_modules.py index 6810091..e8d4d67 100644 --- a/scripts/load_shop_modules.py +++ b/scripts/load_shop_modules.py @@ -5,7 +5,7 @@ import shutil PROP_SHOP_MODULES_DIR = "./Props.Shop/" -PROPS_SHOP_MODULES_DST = "./Props/shops/" +PROPS_SHOP_MODULES_DST = "./Props/shops/." NET_VER = "net6.0" SHOP_MODULE_GLOB = "**/bin/Release/{net_ver}/publish/*.{ext}" @@ -15,11 +15,12 @@ EXTS = ["deps.json", "dll"] def load(): os.chdir(os.path.dirname(os.path.realpath(__file__))) os.chdir("..") + os.makedirs(os.path.dirname(PROPS_SHOP_MODULES_DST), exist_ok=True) for ext in EXTS: results = glob(os.path.join(PROP_SHOP_MODULES_DIR, SHOP_MODULE_GLOB.format(net_ver=NET_VER, ext=ext))) for result in results: - shutil.copy(result, os.path.abspath(PROPS_SHOP_MODULES_DST)) + shutil.copy(result, PROPS_SHOP_MODULES_DST) if __name__ == "__main__":