Skip to content

Commit

Permalink
Switched to .net7 self-contained
Browse files Browse the repository at this point in the history
  • Loading branch information
paulober committed Jan 6, 2023
1 parent a3e0e21 commit 80e1158
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 18 deletions.
4 changes: 2 additions & 2 deletions ArcticControl.Core/ArcticControl.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>ArcticControl.Core</RootNamespace>
<Platforms>x64;arm64;AnyCPU</Platforms>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>10.0</LangVersion>
<LangVersion>11.0</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 2 additions & 4 deletions ArcticControl.GPUInterop/ArcticControl.GPUInterop.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@
<ProjectGuid>{BD67FCB4-6655-40A6-A5F5-5D94C0E388DF}</ProjectGuid>
<Keyword>NetCoreCProj</Keyword>
<RootNamespace>ArcticControlGPUInterop</RootNamespace>
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.22000.0</TargetPlatformMinVersion>
<TargetFramework>net6.0</TargetFramework>
<WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
Expand Down
4 changes: 2 additions & 2 deletions ArcticControl.IntelWebAPI/ArcticControl.IntelWebAPI.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>ArcticControl.IntelWebAPI</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
<LangVersion>11.0</LangVersion>
<Platforms>x64;arm64;AnyCPU</Platforms>
</PropertyGroup>

Expand Down
4 changes: 4 additions & 0 deletions ArcticControl.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArcticControl.IntelWebAPI", "ArcticControl.IntelWebAPI\ArcticControl.IntelWebAPI.csproj", "{9EB12207-ACC7-4A02-8BDA-7FC6741DAEB4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projektmappenelemente", "Projektmappenelemente", "{C9C074E6-5E11-444C-9DE2-261EAB59D18A}"
ProjectSection(SolutionItems) = preProject
installCertificate.cmd = installCertificate.cmd
README.md = README.md
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArcticControl.GPUInterop", "ArcticControl.GPUInterop\ArcticControl.GPUInterop.vcxproj", "{BD67FCB4-6655-40A6-A5F5-5D94C0E388DF}"
EndProject
Expand Down
15 changes: 8 additions & 7 deletions ArcticControl/ArcticControl.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.22621.0</TargetFramework>
<TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
<TargetPlatformMinVersion>10.0.22000.0</TargetPlatformMinVersion>
<RootNamespace>ArcticControl</RootNamespace>
<ApplicationIcon>Assets/WindowIcon.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UseWinUI>true</UseWinUI>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UseWinUI>true</UseWinUI>
<EnableMsixTooling>true</EnableMsixTooling>
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
<SupportedOSPlatformVersion>10.0.22000.0</SupportedOSPlatformVersion>
<LangVersion>10.0</LangVersion>
<SupportedOSPlatformVersion>10.0.22000.0</SupportedOSPlatformVersion>
<LangVersion>11.0</LangVersion>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -34,6 +34,7 @@
<AppxPackageSigningTimestampServerUrl>http://timestamp.digicert.com</AppxPackageSigningTimestampServerUrl>
<AppInstallerUri>https://github.com/paulober/ArcticControl/releases/latest/download/</AppInstallerUri>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<DefaultLanguage>en-US</DefaultLanguage>
</PropertyGroup>

<ItemGroup>
Expand All @@ -43,7 +44,7 @@
<None Remove="Views\StartPage.xaml" />
</ItemGroup>

<ItemGroup>
<ItemGroup>
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ArcticControl/Services/ThemeSelectorService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private async Task<ElementTheme> LoadThemeFromSettingsAsync()
return cacheTheme;
}

return ElementTheme.Default;
return ElementTheme.Dark;
}

private async Task SaveThemeInSettingsAsync(ElementTheme theme)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ The application uses Microsoft AppCenter Analytics/Crashes, please read the rela

This application is a project of a Intel® Arc™ community member and NOT related to Intel® in any way.

If you have feedback let me now in following thread on the Intel Insiders Community discord: https://discord.com/channels/554824368740630529/1049459749160235058 or here on the repo the issues tab-
If you have feedback let me now in following thread on the Intel Insiders Community discord: https://discord.com/channels/554824368740630529/1049459749160235058 or here on the repo the issues tab.

# Installation instructions
| All files contain "x64" or "arm64" in their name, always download the version of a certain file which contains your processor architecture.

- Head over to the releases tab on the right and download the file ending with .msix from the latest release.

### Requirements
- Microsoft [.NET 6 Desktop Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
- Microsoft [.NET 7 Desktop Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)

### First installation
- If this is the first time you install this application, head over to the releases tab on the right and download the files ending with .cer and .cmd from the latest release.
Expand Down

0 comments on commit 80e1158

Please sign in to comment.