From 9b1935e7a7b3605dbd5146bdda96bfd8acba6958 Mon Sep 17 00:00:00 2001 From: "J. Fronny" <6260391-JFronny@users.noreply.gitlab.com> Date: Wed, 3 Feb 2021 20:55:22 +0000 Subject: [PATCH] Hopefully fix --- UpTool build tool/UpTool build tool.csproj | 6 +++--- UpToolCLI/UpToolCLI.csproj | 2 +- UpToolLib/Tool/XmlTool.cs | 14 ++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/UpTool build tool/UpTool build tool.csproj b/UpTool build tool/UpTool build tool.csproj index 84d9eba..103ad83 100644 --- a/UpTool build tool/UpTool build tool.csproj +++ b/UpTool build tool/UpTool build tool.csproj @@ -1,6 +1,6 @@ - + - net5.0 + netcoreapp3.1 Exe UpTool_build_tool pkgtool @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/UpToolCLI/UpToolCLI.csproj b/UpToolCLI/UpToolCLI.csproj index a4acf9c..b85c5ec 100644 --- a/UpToolCLI/UpToolCLI.csproj +++ b/UpToolCLI/UpToolCLI.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + netcoreapp3.1 uptool false 1.0.* diff --git a/UpToolLib/Tool/XmlTool.cs b/UpToolLib/Tool/XmlTool.cs index 2475887..cbc2124 100644 --- a/UpToolLib/Tool/XmlTool.cs +++ b/UpToolLib/Tool/XmlTool.cs @@ -22,11 +22,12 @@ namespace UpToolLib.Tool "https://raw.githubusercontent.com/CreepyCrafter24/UpTool2/master/Meta.xml", "https://raw.githubusercontent.com/JFronny/UpTool2/master/Meta.xml", "https://gist.githubusercontent.com/JFronny/f1ccbba3d8a2f5862592bb29fdb612c4/raw/Meta.xml", - "https://github.com/JFronny/UpTool2/releases/latest/download/meta.xml" + "https://github.com/JFronny/UpTool2/releases/latest/download/meta.xml", + "https://gitlab.com/JFronny/UpTool2/-/jobs/artifacts/master/raw/meta.xml?job=uptool" } .Contains(meta.Element("UpdateSource").Value)) meta.Element("UpdateSource").Value = - "https://gitlab.com/JFronny/UpTool2/-/jobs/artifacts/master/raw/meta.xml?job=uptool"; + "https://gitlab.com/uptool/UpTool2/-/jobs/artifacts/master/raw/meta.xml?job=uptool"; if (meta.Element("Repos") == null) meta.Add(new XElement("Repos")); if (meta.Element("Repos").Elements("Repo").Count() == 0) @@ -36,7 +37,7 @@ namespace UpToolLib.Tool { meta.Element("Repos").Add(new XElement("Repo", new XElement("Name", "UpTool2 official Repo"), new XElement("Link", - "https://gitlab.com/JFronny/UpTool2/snippets/1988600/raw"))); + "https://gitlab.com/uptool/UpTool2/-/snippets/1988600/raw/master/Repo.xml"))); } } meta.Element("Repos").Elements("Repo").Select(s => s.Element("Link")) @@ -44,14 +45,15 @@ namespace UpToolLib.Tool { null, "https://github.com/JFronny/UpTool2/releases/download/Repo/Repo.xml", "https://raw.githubusercontent.com/JFronny/UpTool2/master/Repo.xml", - "https://gist.githubusercontent.com/JFronny/f1ccbba3d8a2f5862592bb29fdb612c4/raw/Repo.xml" + "https://gist.githubusercontent.com/JFronny/f1ccbba3d8a2f5862592bb29fdb612c4/raw/Repo.xml", + "https://gitlab.com/JFronny/UpTool2/snippets/1988600/raw" }.Contains(s.Value)) .ToList().ForEach(s => s.Value = - "https://gitlab.com/JFronny/UpTool2/snippets/1988600/raw"); + "https://gitlab.com/uptool/UpTool2/-/snippets/1988600/raw/master/Repo.xml"); if (meta.Element("LocalRepo") == null) meta.Add(new XElement("LocalRepo")); x.Save(PathTool.InfoXml); } } -} \ No newline at end of file +}