Skip to content

Commit

Permalink
🔧 Fix: Merge pull request #37 from Crequency/dev=main
Browse files Browse the repository at this point in the history
[Pull Request] 修复 KitX.Contract.CSharp 编译失败的意外错误
  • Loading branch information
Dynesshely authored Aug 6, 2022
2 parents f58521b + f9db290 commit a842f05
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 22 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions KitX Contracts/KitX.Contract.CSharp/KitX.Contract.CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
</PropertyGroup>

<ItemGroup>
<None Include="..\..\KitX Dashboard\Assets\KitX-Background-ani.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
<None Update="KitX-Background-ani.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

</Project>
12 changes: 12 additions & 0 deletions KitX Dashboard/Views/Pages/DevicePage.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using KitX_Dashboard.ViewModels.Pages;
using System.Timers;

namespace KitX_Dashboard.Views.Pages
{
Expand All @@ -14,6 +15,17 @@ public DevicePage()
InitializeComponent();

DataContext = viewModel;

Timer resourcesTimer = new()
{
Interval = 5000,
AutoReset = true,
};
resourcesTimer.Elapsed += (_, _) =>
{

};
resourcesTimer.Start();
}

private void InitializeComponent()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace KitX.Contract.CSharp
namespace KitX.Contract.CSharp.Test
{
[TestClass]
public class Test_IIdentityInterface
public class UnitTest1
{
[TestMethod]
public void TestMethod1()
Expand Down
30 changes: 15 additions & 15 deletions KitX.sln
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Official Plugins", "Ki
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Contracts", "KitX Contracts", "{B3D8D064-E8B8-4673-A6C0-F6392DC2A444}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KitX.Contract.CSharp", "KitX Test\KitX Contracts\KitX.Contract.CSharp\KitX.Contract.CSharp.csproj", "{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1BBE8A6D-740D-4252-ACF0-0AF4882DF8B5}"
ProjectSection(SolutionItems) = preProject
nuget.config = nuget.config
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KitX.Contract.CSharp.Test", "KitX Test\KitX Contracts\KitX.Contract.CSharp.Test\KitX.Contract.CSharp.Test.csproj", "{8D00A21D-EF71-4CD2-BC63-CD97C9687695}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -178,18 +178,18 @@ Global
{57BF15CB-6D63-4A08-A426-F9540E258465}.Release|x64.Build.0 = Release|Any CPU
{57BF15CB-6D63-4A08-A426-F9540E258465}.Release|x86.ActiveCfg = Release|Any CPU
{57BF15CB-6D63-4A08-A426-F9540E258465}.Release|x86.Build.0 = Release|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Debug|x64.ActiveCfg = Debug|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Debug|x64.Build.0 = Debug|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Debug|x86.ActiveCfg = Debug|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Debug|x86.Build.0 = Debug|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Release|Any CPU.Build.0 = Release|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Release|x64.ActiveCfg = Release|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Release|x64.Build.0 = Release|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Release|x86.ActiveCfg = Release|Any CPU
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8}.Release|x86.Build.0 = Release|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Debug|x64.ActiveCfg = Debug|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Debug|x64.Build.0 = Debug|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Debug|x86.ActiveCfg = Debug|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Debug|x86.Build.0 = Debug|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Release|Any CPU.Build.0 = Release|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Release|x64.ActiveCfg = Release|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Release|x64.Build.0 = Release|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Release|x86.ActiveCfg = Release|Any CPU
{8D00A21D-EF71-4CD2-BC63-CD97C9687695}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -208,7 +208,7 @@ Global
{BA4334E4-0992-4A5B-9AF5-EBB91DD5EC0A} = {F8379F09-5E41-48AA-9643-047BD17B1CA7}
{680E3F3C-FA2B-48C7-81C3-A6119C340006} = {F8379F09-5E41-48AA-9643-047BD17B1CA7}
{B3D8D064-E8B8-4673-A6C0-F6392DC2A444} = {F8379F09-5E41-48AA-9643-047BD17B1CA7}
{5B6A588E-5491-410C-A5CC-A4B2B5AAC5F8} = {B3D8D064-E8B8-4673-A6C0-F6392DC2A444}
{8D00A21D-EF71-4CD2-BC63-CD97C9687695} = {B3D8D064-E8B8-4673-A6C0-F6392DC2A444}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {09BBC227-F41B-4D10-9E38-0EEE07ED17BC}
Expand Down

0 comments on commit a842f05

Please sign in to comment.