Skip to content

Commit 5d28f2a

Browse files
authored
Merge pull request #5 from SamHou2007/develop
Release 3.0.1
2 parents 53c5ced + 81a3341 commit 5d28f2a

15 files changed

+864
-25
lines changed

.github/workflows/dotnet.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: 5.0.x
19+
dotnet-version: 6.0.x
2020
- name: Restore dependencies
2121
run: dotnet restore
2222
- name: Build

TCSetup/TCSetup.vdproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -171,22 +171,22 @@
171171
"Product"
172172
{
173173
"Name" = "8:Microsoft Visual Studio"
174-
"ProductName" = "8:TCSetup"
175-
"ProductCode" = "8:{7738777E-2FF0-4D73-BA7F-CE5C4F8C09AF}"
176-
"PackageCode" = "8:{85FC3FD2-AC7A-4722-8FB3-442D69067E7D}"
174+
"ProductName" = "8:TimeControl"
175+
"ProductCode" = "8:{0E4B2419-C67F-4087-B60D-68E342D1166C}"
176+
"PackageCode" = "8:{C0B174F2-8D69-408C-BE9C-66606508CB47}"
177177
"UpgradeCode" = "8:{A7DC5BC4-7E3E-4B58-A0AD-3C9AC9F873C1}"
178178
"AspNetVersion" = "8:4.0.30319.0"
179179
"RestartWWWService" = "11:FALSE"
180-
"RemovePreviousVersions" = "11:FALSE"
180+
"RemovePreviousVersions" = "11:TRUE"
181181
"DetectNewerInstalledVersion" = "11:TRUE"
182182
"InstallAllUsers" = "11:FALSE"
183-
"ProductVersion" = "8:2.0.1"
184-
"Manufacturer" = "8:Default Company Name"
183+
"ProductVersion" = "8:3.0.1"
184+
"Manufacturer" = "8:SamHou"
185185
"ARPHELPTELEPHONE" = "8:"
186186
"ARPHELPLINK" = "8:"
187187
"Title" = "8:TCSetup"
188188
"Subject" = "8:"
189-
"ARPCONTACT" = "8:Default Company Name"
189+
"ARPCONTACT" = "8:SamHou"
190190
"Keywords" = "8:"
191191
"ARPCOMMENTS" = "8:"
192192
"ARPURLINFOABOUT" = "8:"
@@ -722,7 +722,7 @@
722722
{
723723
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B7C31D1C4E42443D89CA87F9596A43B7"
724724
{
725-
"SourcePath" = "8:..\\TimeControl\\obj\\Release\\net5.0-windows\\apphost.exe"
725+
"SourcePath" = "8:..\\TimeControl\\obj\\Debug\\net6.0-windows10.0.22000.0\\apphost.exe"
726726
"TargetName" = "8:"
727727
"Tag" = "8:"
728728
"Folder" = "8:_57FF55C0487B4507A7ADC64F8E5966A5"

TimeControl/App.cs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace TimeControl
8+
{
9+
internal class App
10+
{
11+
private string name;
12+
private string location;
13+
public string Name { get { return name; }}
14+
private int time;
15+
16+
public string ReportApp()
17+
{
18+
return Name + " 已使用 " + time+" 秒!";
19+
}
20+
public App(string name, string location)
21+
{
22+
this.name = name;
23+
this.location = location;
24+
time = 0;
25+
}
26+
public void Run()
27+
{
28+
time++;
29+
}
30+
}
31+
}

TimeControl/ControlPanel.Designer.cs

+221-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)