Skip to content

Commit 913fef5

Browse files
authored
Merge pull request #118 from Erol444/fix-01-06-2022
Fix 13 06 2022
2 parents fefc28a + 6119271 commit 913fef5

File tree

141 files changed

+24946
-1859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+24946
-1859
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,44 +10,26 @@ jobs:
1010
build:
1111
runs-on: windows-2019
1212
steps:
13-
- name: setup-msbuild
14-
uses: microsoft/setup-msbuild@v1
15-
16-
- name: Setup NuGet
17-
uses: NuGet/[email protected]
13+
- name: Setup dotnet
14+
uses: actions/setup-dotnet@v2
15+
with:
16+
dotnet-version: 6.0.x
1817

1918
- name: 'Checkout repo'
2019
uses: actions/checkout@v2
2120

2221
- name: Navigate to Workspace
2322
run: cd $GITHUB_WORKSPACE
24-
25-
- name: Get cache
26-
uses: actions/cache@v2
27-
with:
28-
path: |
29-
packages
30-
TbsCore/obj/project.assets.json
31-
TbsCore/TbsCore.csproj.nuget.g.targets
32-
TbsCore/TbsCore.csproj.nuget.g.props.
33-
key: ${{ runner.os }}-nuget-${{ hashFiles('TbsCore/packages.lock.json') }}
34-
restore-keys: |
35-
${{ runner.os }}-nuget-
36-
37-
- name: Restore Packages
38-
run: |
39-
nuget restore TbsCore/TbsCore.csproj -PackagesDirectory packages
40-
nuget restore TravBotSharp/TbsWinForms.csproj -PackagesDirectory packages
4123

4224
- name: Build Bot
4325
run: |
44-
msbuild.exe TravBotSharp.sln /t:TbsWinForms /nologo /nr:false /p:DeleteExistingFiles=True /p:platform="Any CPU" /p:configuration="Release" /m /p:BuildProjectReferences=true /p:BUILD_NUMBER=30.4.1975.0
26+
dotnet publish TbsWinformNet6 -c Release --self-contained true -p:PublishSingleFile=true -r win-x86
4527
4628
- name: Upload a Build Artifact
4729
uses: actions/upload-artifact@v2
4830
with:
4931
name: TBS-Build-${{ github.sha }}
50-
path: TravBotSharp\bin\Release
32+
path: TbsWinformNet6\bin\Release\net6.0-windows\win-x86\publish\
5133
if-no-files-found: error
5234

5335
- name: Comment on PR when success

TbsWinformNet6/ControlPanel.Designer.cs

Lines changed: 534 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)