Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Bassman2 committed Oct 1, 2024
1 parent b8e494f commit 1b6d22e
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 26 deletions.
24 changes: 24 additions & 0 deletions AVMHomeAutomation.sln
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVMHomeAutomation48", "Src\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVMHomeAutomation462", "Src\AVMHomeAutomation462\AVMHomeAutomation462.csproj", "{BF30B41B-6500-4AFE-A646-59FA108167AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AVMHomeAutomation80", "Src\AVMHomeAutomation80\AVMHomeAutomation80.csproj", "{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -251,6 +253,26 @@ Global
{BF30B41B-6500-4AFE-A646-59FA108167AA}.Release|x64.Build.0 = Release|Any CPU
{BF30B41B-6500-4AFE-A646-59FA108167AA}.Release|x86.ActiveCfg = Release|Any CPU
{BF30B41B-6500-4AFE-A646-59FA108167AA}.Release|x86.Build.0 = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|ARM.Build.0 = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|ARM64.Build.0 = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|x64.ActiveCfg = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|x64.Build.0 = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|x86.ActiveCfg = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Debug|x86.Build.0 = Debug|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|Any CPU.Build.0 = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|ARM.ActiveCfg = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|ARM.Build.0 = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|ARM64.ActiveCfg = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|ARM64.Build.0 = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|x64.ActiveCfg = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|x64.Build.0 = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|x86.ActiveCfg = Release|Any CPU
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -267,6 +289,7 @@ Global
{A8E6E9FE-4CC7-48C6-800E-5245ED1A2DFE} = {F6B4B28F-9527-4AD6-831E-F05352B0782C}
{83F27F9F-8AF7-46AF-934B-BC5F65290028} = {E29B4D4A-76AE-454F-8CD8-90148AA01D52}
{BF30B41B-6500-4AFE-A646-59FA108167AA} = {E29B4D4A-76AE-454F-8CD8-90148AA01D52}
{F3303C19-802E-4BF1-84D9-61CE4D93BD4B} = {E29B4D4A-76AE-454F-8CD8-90148AA01D52}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EA554914-5C65-43F3-ADFB-C436CCD65309}
Expand All @@ -278,6 +301,7 @@ Global
Src\AVMHomeAutomationShare\AVMHomeAutomationShare.projitems*{83f27f9f-8af7-46af-934b-bc5f65290028}*SharedItemsImports = 4
Src\AVMHomeAutomationShare\AVMHomeAutomationShare.projitems*{ab16ac34-84e0-410b-bd72-9a338d8e8cef}*SharedItemsImports = 5
Src\AVMHomeAutomationShare\AVMHomeAutomationShare.projitems*{bf30b41b-6500-4afe-a646-59fa108167aa}*SharedItemsImports = 4
Src\AVMHomeAutomationShare\AVMHomeAutomationShare.projitems*{f3303c19-802e-4bf1-84d9-61ce4d93bd4b}*SharedItemsImports = 5
Src\AVMHomeAutomationShare\AVMHomeAutomationShare.projitems*{f5df3beb-95c6-4764-8485-a24ec59e8282}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions Demo/AVMHomeAutomationDemo70/AVMHomeAutomationDemo70.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions Src/AVMHomeAutomation462/AVMHomeAutomation462.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<AssemblyOriginatorKeyFile>Bassman.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
Expand All @@ -56,11 +56,11 @@
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Text.Encodings.Web.7.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=7.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Text.Json.7.0.2\lib\net462\System.Text.Json.dll</HintPath>
<Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
Expand Down
6 changes: 3 additions & 3 deletions Src/AVMHomeAutomation462/packages.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net461" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
<package id="System.Memory" version="4.5.5" targetFramework="net461" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net461" />
<package id="System.Text.Encodings.Web" version="7.0.0" targetFramework="net461" />
<package id="System.Text.Json" version="7.0.2" targetFramework="net462" />
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
<package id="System.Text.Json" version="8.0.4" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages>
12 changes: 6 additions & 6 deletions Src/AVMHomeAutomation48/AVMHomeAutomation48.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<AssemblyOriginatorKeyFile>Bassman.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
Expand All @@ -56,11 +56,11 @@
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=7.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Text.Json.7.0.2\lib\net462\System.Text.Json.dll</HintPath>
<Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
Expand Down
6 changes: 3 additions & 3 deletions Src/AVMHomeAutomation48/packages.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net48" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="System.Memory" version="4.5.5" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
<package id="System.Text.Encodings.Web" version="7.0.0" targetFramework="net48" />
<package id="System.Text.Json" version="7.0.2" targetFramework="net48" />
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48" />
<package id="System.Text.Json" version="8.0.4" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
</packages>
14 changes: 14 additions & 0 deletions Src/AVMHomeAutomation80/AVMHomeAutomation80.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>Bassman.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<Import Project="..\AVMHomeAutomationShare\AVMHomeAutomationShare.projitems" Label="Shared" />

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Target.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ColorDefaultTemperature.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Temperature.cs" />
<Compile Include="..\AVMHomeAutomationShare\ItemIdentifier.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ItemIdentifier.cs" />
<Compile Include="$(MSBuildThisFileDirectory)TemplateList.cs" />
<Compile Include="$(MSBuildThisFileDirectory)XmlNullableBool.cs" />
<Compile Include="$(MSBuildThisFileDirectory)XmlNullableInt.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Import Project="..\AVMHomeAutomationShare\AVMHomeAutomationShare.projitems" Label="Shared" />

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="7.0.2" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
</ItemGroup>

</Project>
11 changes: 7 additions & 4 deletions Test/AVMHomeAutomationTest70/AVMHomeAutomationTest70.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="coverlet.collector" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 1b6d22e

Please # to comment.