Skip to content

Commit 6dc921c

Browse files
thewizrdthewizrd
committed
SimpleWeather.Windows: v5.8.0
1 parent 4ce34c8 commit 6dc921c

File tree

10 files changed

+49
-98
lines changed

10 files changed

+49
-98
lines changed

‎Directory.Build.props

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818

1919
<!-- Build acceleration -->
2020
<PropertyGroup>
21-
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
21+
<AccelerateBuildsInVisualStudio Condition="'$(Configuration)' == 'Debug'">true</AccelerateBuildsInVisualStudio>
22+
<AccelerateBuildsInVisualStudio Condition="'$(Configuration)' == 'Release'">false</AccelerateBuildsInVisualStudio>
23+
</PropertyGroup>
24+
25+
<PropertyGroup>
26+
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
2227
</PropertyGroup>
2328
</Project>

‎SCRCHost/SCRCHost.csproj

+3-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<Platforms>x64;x86;ARM;ARM64</Platforms>
11+
<Platforms>x64;x86;ARM64</Platforms>
1212
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
13-
<RuntimeIdentifiers>win-x86;win-x64;win-arm;win-arm64</RuntimeIdentifiers>
13+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
1414
<AssetTargetFallback>native</AssetTargetFallback>
1515

1616
<IsPackable>false</IsPackable>
@@ -28,15 +28,12 @@
2828
<PropertyGroup Condition="'$(Platform)'=='x64'">
2929
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
3030
</PropertyGroup>
31-
<PropertyGroup Condition="'$(Platform)'=='ARM'">
32-
<RuntimeIdentifier>win-arm</RuntimeIdentifier>
33-
</PropertyGroup>
3431
<PropertyGroup Condition="'$(Platform)'=='ARM64'">
3532
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
3633
</PropertyGroup>
3734

3835
<ItemGroup>
39-
<PackageReference Include="DNNE" Version="1.1.0" />
36+
<PackageReference Include="DNNE" Version="2.0.1" />
4037
</ItemGroup>
4138

4239
</Project>

‎SimpleWeather.BackgroundTasks/SimpleWeather.BackgroundTasks.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
55
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
66
<RootNamespace>SimpleWeather.BackgroundTasks</RootNamespace>
7-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm;win10-arm64</RuntimeIdentifiers>
8-
<Platforms>x64;x86;ARM;ARM64</Platforms>
7+
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
8+
<Platforms>x64;x86;ARM64</Platforms>
99
</PropertyGroup>
1010

1111
<!-- CsWinRT properties -->

‎SimpleWeather.NET.sln

-70
Large diffs are not rendered by default.

‎SimpleWeather.Shared/Utils/AnalyticsLogger.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !DEBUG && !UNIT_TEST
1+
#if !DEBUG && !UNIT_TEST && !__MACCATALYST__
22
using Microsoft.AppCenter.Analytics;
33
#endif
44
using SimpleWeather.Utils;
@@ -15,7 +15,7 @@ public static void LogEvent(string eventName, IDictionary<string, string> proper
1515
#if DEBUG
1616
string append = properties == null ? String.Empty : Environment.NewLine + JSONParser.Serializer(properties);
1717
Logger.WriteLine(LoggerLevel.Info, "EVENT | " + eventName + append);
18-
#elif !UNIT_TEST
18+
#elif !UNIT_TEST && !__MACCATALYST__
1919
Analytics.TrackEvent(eventName, properties);
2020
#endif
2121
}

‎SimpleWeather.Windows/Package.appxmanifest

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
1010
xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
1111
IgnorableNamespaces="uap rescap mp desktop4">
12-
<Identity Name="49586DaveAntoine.SimpleWeatherDebug" Publisher="CN=FC137F73-0421-4275-8C89-E761F4D1BC3D" Version="5.7.2.0" />
12+
<Identity Name="49586DaveAntoine.SimpleWeather-Asimpleweatherapp" Publisher="CN=FC137F73-0421-4275-8C89-E761F4D1BC3D" Version="5.8.0.0" />
1313
<mp:PhoneIdentity PhoneProductId="06966ad9-299e-4a4c-8204-576b8ada7455" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
1414
<Properties>
1515
<DisplayName>SimpleWeather - A simple weather app</DisplayName>
@@ -72,7 +72,7 @@
7272
<com:ExeServer
7373
Executable="SimpleWeather.Windows.exe"
7474
Arguments="-RegisterProcessAsComServer"
75-
LaunchAndActivationPermission="O:PSG:BUD:(A;;11;;;IU)(A;;11;;;S-1-15-2-537857025-621772652-3741139397-2615399211-928015427-4269635983-3021255191)S:(ML;;NX;;;LW)">
75+
LaunchAndActivationPermission="O:PSG:BUD:(A;;11;;;IU)(A;;11;;;S-1-15-2-2670365806-2911716598-2260801434-585721284-1716833224-1671719374-3724409756)S:(ML;;NX;;;LW)">
7676
<com:Class Id="148C5627-665B-4DAC-AB27-64397E80335A" />
7777
</com:ExeServer>
7878
</com:ComServer>

‎SimpleWeather.Windows/Properties/PublishProfiles/win10-arm64.pubxml

+8-5
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
55
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
66
<PropertyGroup>
77
<PublishProtocol>FileSystem</PublishProtocol>
8-
<Platform>arm64</Platform>
8+
<Platform>ARM64</Platform>
99
<RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
10-
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
10+
<PublishDir>bin\\\win10-arm64\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
12-
<PublishSingleFile>False</PublishSingleFile>
12+
<PublishSingleFile>false</PublishSingleFile>
1313
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
14-
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
14+
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">true</PublishReadyToRun>
15+
<Configuration>Release</Configuration>
16+
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
17+
<PublishTrimmed>false</PublishTrimmed>
1518
<!--
1619
See https://github.com/microsoft/CsWinRT/issues/373
1720
<PublishTrimmed>True</PublishTrimmed>
1821
-->
1922
</PropertyGroup>
20-
</Project>
23+
</Project>

‎SimpleWeather.Windows/Properties/PublishProfiles/win10-x64.pubxml

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Platform>x64</Platform>
99
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
10-
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
10+
<PublishDir>bin\\\win10-x64\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
12-
<PublishSingleFile>False</PublishSingleFile>
12+
<PublishSingleFile>false</PublishSingleFile>
1313
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
14-
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
14+
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">true</PublishReadyToRun>
15+
<Configuration>Release</Configuration>
16+
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
17+
<PublishTrimmed>false</PublishTrimmed>
1518
<!--
1619
See https://github.com/microsoft/CsWinRT/issues/373
1720
<PublishTrimmed>True</PublishTrimmed>
1821
-->
1922
</PropertyGroup>
20-
</Project>
23+
</Project>

‎SimpleWeather.Windows/Properties/PublishProfiles/win10-x86.pubxml

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Platform>x86</Platform>
99
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
10-
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
10+
<PublishDir>bin\\\win10-x86\publish\</PublishDir>
1111
<SelfContained>true</SelfContained>
12-
<PublishSingleFile>False</PublishSingleFile>
12+
<PublishSingleFile>false</PublishSingleFile>
1313
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
14-
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
14+
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">true</PublishReadyToRun>
15+
<Configuration>Release</Configuration>
16+
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
17+
<PublishTrimmed>false</PublishTrimmed>
1518
<!--
1619
See https://github.com/microsoft/CsWinRT/issues/373
1720
<PublishTrimmed>True</PublishTrimmed>
1821
-->
1922
</PropertyGroup>
20-
</Project>
23+
</Project>

‎SimpleWeather.Windows/SimpleWeather.Windows.csproj

+12-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
77
<RootNamespace>SimpleWeather.NET</RootNamespace>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
9-
<Platforms>x86;x64;ARM;ARM64</Platforms>
10-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm;win10-arm64</RuntimeIdentifiers>
9+
<Platforms>x86;x64;ARM64</Platforms>
10+
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
1111
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
1212

1313
<DefineConstants>$(DefineConstants);WINDOWS;WINUI</DefineConstants>
@@ -20,6 +20,16 @@
2020
<Title>SimpleWeather</Title>
2121
<ApplicationIcon>Assets\logo.ico</ApplicationIcon>
2222
<ImplicitUsings>enable</ImplicitUsings>
23+
24+
<!-- Build and Package -->
25+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
26+
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
27+
<AppxPackageDir>$(ProjectDir)AppPackages\</AppxPackageDir>
28+
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
29+
<GenerateTestArtifacts>False</GenerateTestArtifacts>
30+
<AppxBundle>Always</AppxBundle>
31+
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
32+
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
2333
</PropertyGroup>
2434

2535
<ItemGroup>

0 commit comments

Comments
 (0)