From 2404dcafadcd480d6ac4aaa3b47e080ba40c10df Mon Sep 17 00:00:00 2001 From: Cryolitia Date: Fri, 13 Oct 2023 06:53:46 +0800 Subject: [PATCH 1/4] Tagged Version --- src/MaaWpfGui/MaaWpfGui.csproj | 6 +++++- src/SyncRes/SyncRes.csproj | 4 ++++ src/SyncRes/TaggifyVersion.ps1 | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/SyncRes/TaggifyVersion.ps1 diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index 636ef46c63..a2ebacd93a 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -67,6 +67,10 @@ + 4.25.1 + 4.25.1 + v4.25.1-alpha.1.d009.ga3f04669d + $(AssemblyVersion) @@ -166,4 +170,4 @@ - \ No newline at end of file + diff --git a/src/SyncRes/SyncRes.csproj b/src/SyncRes/SyncRes.csproj index 613fa3d224..3585c76172 100644 --- a/src/SyncRes/SyncRes.csproj +++ b/src/SyncRes/SyncRes.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/src/SyncRes/TaggifyVersion.ps1 b/src/SyncRes/TaggifyVersion.ps1 new file mode 100644 index 0000000000..aff961606b --- /dev/null +++ b/src/SyncRes/TaggifyVersion.ps1 @@ -0,0 +1,8 @@ +$tag = (Invoke-Expression "git describe --abbrev=0 --tags") -replace '.*?/', '' +$tag -match '\d+\.\d+\.\d+' +(Get-Content ..\MaaWpfGui\MaaWpfGui.csproj) | + ForEach-Object { + $_ -replace '(?(<(Assembly|File)Version>)).*?(?())', ('${a}' + $Matches[0] + '${b}')` + -replace '(?()).*?(?())', ('${a}' + $tag + '${b}') + } | + Set-Content ..\MaaWpfGui\MaaWpfGui.csproj From 168be2e48c064eb3b3cd918b89b2e1699799b99a Mon Sep 17 00:00:00 2001 From: Cryolitia Date: Fri, 13 Oct 2023 22:03:03 +0800 Subject: [PATCH 2/4] update --- src/MaaWpfGui/Directory.Build.props | 8 ++++++++ src/MaaWpfGui/MaaWpfGui.csproj | 4 ++++ src/MaaWpfGui/TaggifyVersion.ps1 | 12 ++++++++++++ src/SyncRes/SyncRes.csproj | 6 +----- src/SyncRes/TaggifyVersion.ps1 | 8 -------- 5 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 src/MaaWpfGui/Directory.Build.props create mode 100644 src/MaaWpfGui/TaggifyVersion.ps1 delete mode 100644 src/SyncRes/TaggifyVersion.ps1 diff --git a/src/MaaWpfGui/Directory.Build.props b/src/MaaWpfGui/Directory.Build.props new file mode 100644 index 0000000000..a99d36b344 --- /dev/null +++ b/src/MaaWpfGui/Directory.Build.props @@ -0,0 +1,8 @@ + + + 4.25.1 + 4.25.1 + v4.25.1-alpha.1.d009.ga3f04669d + 4.25.1 + + diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index a2ebacd93a..524fd68a20 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -1,4 +1,8 @@ + + + + WinExe MaaWpfGui diff --git a/src/MaaWpfGui/TaggifyVersion.ps1 b/src/MaaWpfGui/TaggifyVersion.ps1 new file mode 100644 index 0000000000..41798b8d16 --- /dev/null +++ b/src/MaaWpfGui/TaggifyVersion.ps1 @@ -0,0 +1,12 @@ +$tag = (Invoke-Expression "git describe --abbrev=0 --tags") -replace '.*?/', '' +$tag -match '\d+(\.\d+){0,3}' +$match = $Matches[0] +$props = " + + $match + $match + $tag + $match + +" +Set-Content -Path Directory.Build.props -Value $props diff --git a/src/SyncRes/SyncRes.csproj b/src/SyncRes/SyncRes.csproj index 3585c76172..d3facb9fae 100644 --- a/src/SyncRes/SyncRes.csproj +++ b/src/SyncRes/SyncRes.csproj @@ -1,4 +1,4 @@ - + RelWithDebInfo;Release;Debug x64;ARM64 @@ -20,8 +20,4 @@ - - - - diff --git a/src/SyncRes/TaggifyVersion.ps1 b/src/SyncRes/TaggifyVersion.ps1 deleted file mode 100644 index aff961606b..0000000000 --- a/src/SyncRes/TaggifyVersion.ps1 +++ /dev/null @@ -1,8 +0,0 @@ -$tag = (Invoke-Expression "git describe --abbrev=0 --tags") -replace '.*?/', '' -$tag -match '\d+\.\d+\.\d+' -(Get-Content ..\MaaWpfGui\MaaWpfGui.csproj) | - ForEach-Object { - $_ -replace '(?(<(Assembly|File)Version>)).*?(?())', ('${a}' + $Matches[0] + '${b}')` - -replace '(?()).*?(?())', ('${a}' + $tag + '${b}') - } | - Set-Content ..\MaaWpfGui\MaaWpfGui.csproj From edd92f5a44fddea393044f29263849acb79442bd Mon Sep 17 00:00:00 2001 From: Cryolitia Date: Fri, 13 Oct 2023 22:05:49 +0800 Subject: [PATCH 3/4] update --- src/MaaWpfGui/.gitignore | 1 + src/MaaWpfGui/Directory.Build.props | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) create mode 100644 src/MaaWpfGui/.gitignore delete mode 100644 src/MaaWpfGui/Directory.Build.props diff --git a/src/MaaWpfGui/.gitignore b/src/MaaWpfGui/.gitignore new file mode 100644 index 0000000000..bf08342356 --- /dev/null +++ b/src/MaaWpfGui/.gitignore @@ -0,0 +1 @@ +Directory.Build.props diff --git a/src/MaaWpfGui/Directory.Build.props b/src/MaaWpfGui/Directory.Build.props deleted file mode 100644 index a99d36b344..0000000000 --- a/src/MaaWpfGui/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.25.1 - 4.25.1 - v4.25.1-alpha.1.d009.ga3f04669d - 4.25.1 - - From 74608dcc6c66092d88299b57d5e5cb185e9c9dd7 Mon Sep 17 00:00:00 2001 From: Cryolitia Date: Fri, 13 Oct 2023 22:25:39 +0800 Subject: [PATCH 4/4] update --- src/MaaWpfGui/MaaWpfGui.csproj | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index 524fd68a20..e8e42d5ef3 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -1,5 +1,5 @@ - - + + @@ -71,10 +71,6 @@ - 4.25.1 - 4.25.1 - v4.25.1-alpha.1.d009.ga3f04669d - $(AssemblyVersion)