diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index ffc76e69..2aee53d1 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -30,7 +30,7 @@ jobs: - name: Generate key shell: powershell - run: bin/x64-Release/winrar-keygen.exe ${{steps.text1.outputs.prop}} ${{steps.text2.outputs.prop}} > rarreg.key + run: bin/x64-Release/winrar-keygen.exe ${{steps.text1.outputs.prop}} ${{steps.text2.outputs.prop}} | out-file -encoding ascii rarreg.key - name: Upload key uses: actions/upload-artifact@v2 diff --git a/.vs/winrar-keygen/v17/.suo b/.vs/winrar-keygen/v17/.suo index a3127e41..b5a26443 100644 Binary files a/.vs/winrar-keygen/v17/.suo and b/.vs/winrar-keygen/v17/.suo differ diff --git a/.vs/winrar-keygen/v17/Browse.VC.db b/.vs/winrar-keygen/v17/Browse.VC.db index d00f5324..b7fff217 100644 Binary files a/.vs/winrar-keygen/v17/Browse.VC.db and b/.vs/winrar-keygen/v17/Browse.VC.db differ diff --git a/.vs/winrar-keygen/v17/ipch/AutoPCH/668bd2139634a6e1/_TMAIN.ipch b/.vs/winrar-keygen/v17/ipch/AutoPCH/668bd2139634a6e1/_TMAIN.ipch index 1d8a7ea3..19d5cfc0 100644 Binary files a/.vs/winrar-keygen/v17/ipch/AutoPCH/668bd2139634a6e1/_TMAIN.ipch and b/.vs/winrar-keygen/v17/ipch/AutoPCH/668bd2139634a6e1/_TMAIN.ipch differ diff --git a/README.md b/README.md index a81f170d..e31a6535 100644 --- a/README.md +++ b/README.md @@ -36,9 +36,7 @@ This repository will tell you how WinRAR license file `"rarreg.key"` is generate See [here](README.HOW_DOES_IT_WORK.md). -## 3. Use Github Actions(Error found) - -2021.12.9 **A bug was found that caused the key generated by Github Actions to be invalid as well, and is being investigated** +## 3. Use Github Actions Github Action is a CI/CD tool introduced after Microsoft acquired Github, and you can run programs on GitHub Action by following these steps. @@ -150,6 +148,8 @@ Example: winrar-keygen.exe "Github" "Github.com" or: winrar-keygen.exe "Github" "Github.com" > rarreg.key + or: + winrar-keygen.exe "Github" "Github.com" > rarreg.key | out-file -encoding ascii rarreg.key ``` ![Terminal](assets/terminal.png) diff --git a/README.zh-CN.md b/README.zh-CN.md index 0dfbbdcb..d62bc815 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -36,9 +36,7 @@ WinRAR不是免费软件。如果你想使用它,你应当向 [__RARLAB__](htt 见 [这里](README.HOW_DOES_IT_WORK.zh-CN.md)。 -## 3. 通过 Github Actions 使用(发现错误) - -2021.12.9 **发现了一个错误,导致Github Actions生成的key也是无效的,正在排查中** +## 3. 通过 Github Actions 使用 Github Action 是微软收购 Github 之后推出的 CI/CD 工具,通过以下步骤即可在 GitHub Action 上运行程序: @@ -146,6 +144,8 @@ Example: winrar-keygen.exe "Github" "Github.com" or: winrar-keygen.exe "Github" "Github.com" > rarreg.key + or: + winrar-keygen.exe "Github" "Github.com" > rarreg.key | out-file -encoding ascii rarreg.key ``` ![Terminal](assets/terminal.png) diff --git a/_tmain.cpp b/_tmain.cpp index 42669465..f073fb8e 100644 --- a/_tmain.cpp +++ b/_tmain.cpp @@ -15,6 +15,8 @@ void Help() { _putts(TEXT(" winrar-keygen.exe \"Github\" \"Github.com\"")); _putts(TEXT(" or:")); _putts(TEXT(" winrar-keygen.exe \"Github\" \"Github.com\" > rarreg.key\n")); + _putts(TEXT(" or:")); + _putts(TEXT(" winrar-keygen.exe \"Github\" \"Github.com\" | out-file -encoding ascii rarreg.key\n")); } void PrintRegisterInfo(const WinRarKeygen::RegisterInfo& Info) { @@ -70,5 +72,4 @@ int _tmain(int argc, PTSTR argv[]) { Help(); } return 0; -} - +} \ No newline at end of file diff --git a/bin/Win32-Release/winrar-keygen.exe b/bin/Win32-Release/winrar-keygen.exe index bada1e43..cb2d88da 100644 Binary files a/bin/Win32-Release/winrar-keygen.exe and b/bin/Win32-Release/winrar-keygen.exe differ diff --git a/bin/Win32-Release/winrar-keygen.pdb b/bin/Win32-Release/winrar-keygen.pdb index 79448482..ba18368f 100644 Binary files a/bin/Win32-Release/winrar-keygen.pdb and b/bin/Win32-Release/winrar-keygen.pdb differ diff --git a/bin/x64-Release/winrar-keygen.exe b/bin/x64-Release/winrar-keygen.exe index bc615009..893c64eb 100644 Binary files a/bin/x64-Release/winrar-keygen.exe and b/bin/x64-Release/winrar-keygen.exe differ diff --git a/bin/x64-Release/winrar-keygen.pdb b/bin/x64-Release/winrar-keygen.pdb index 343c9a20..0e7a47cc 100644 Binary files a/bin/x64-Release/winrar-keygen.pdb and b/bin/x64-Release/winrar-keygen.pdb differ diff --git a/keygen/info.json b/keygen/info.json index 1b6160d8..16d21a8e 100644 --- a/keygen/info.json +++ b/keygen/info.json @@ -1,4 +1,4 @@ { "text1": "Github", - "text2": "GithubTeam" + "text2": "Github.com" } diff --git a/winrar-keygen.aps b/winrar-keygen.aps index 0196f319..5b13e70e 100644 Binary files a/winrar-keygen.aps and b/winrar-keygen.aps differ diff --git a/winrar-keygen.rc b/winrar-keygen.rc index 7d58a8d0..d9922f38 100644 --- a/winrar-keygen.rc +++ b/winrar-keygen.rc @@ -61,8 +61,8 @@ IDI_ICON1 ICON "icon.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,1,0 - PRODUCTVERSION 2,0,1,0 + FILEVERSION 2,0,2,0 + PRODUCTVERSION 2,0,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,12 +79,12 @@ BEGIN BEGIN VALUE "CompanyName", "WinRAR Keygen" VALUE "FileDescription", "WinRAR Key Generation Tool" - VALUE "FileVersion", "2.0.1.0" + VALUE "FileVersion", "2.0.2.0" VALUE "InternalName", "winrar-keygen.exe" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "winrar-keygen.exe" VALUE "ProductName", "WinRAR Keygen" - VALUE "ProductVersion", "2.0.1.0" + VALUE "ProductVersion", "2.0.2.0" END END BLOCK "VarFileInfo"