Skip to content

Commit d4db459

Browse files
Soap-141Soap-141
committed
chore: Move LocationResult in Abstractions
1 parent 0946016 commit d4db459

File tree

9 files changed

+47
-37
lines changed

9 files changed

+47
-37
lines changed

‎BREAKING_CHANGES.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22

33
<!-- Add a header (##) with the version and list the breaking changes.-->
44

5-
## 1.0.x
5+
## 3.0.x
66
<!--
77
- `Something` was removed.
88
- `This` was renamed to `That`.
9-
-->
9+
-->
10+
11+
## 2.0.x
12+
13+
- Updated target framework from .NET 6 to .NET 8.
14+
- Updated Uno.WinUI to 5.0.19.
15+
- `LocationResult` was moved to `GeolocatorService.Abstractions`.

‎GeolocatorService.sln‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ Global
291291
{6B817CE2-CF55-4159-93D1-3004017A42FA}.Release|x86.ActiveCfg = Release|Any CPU
292292
{6B817CE2-CF55-4159-93D1-3004017A42FA}.Release|x86.Build.0 = Release|Any CPU
293293
{6B817CE2-CF55-4159-93D1-3004017A42FA}.Release|x86.Deploy.0 = Release|Any CPU
294-
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
294+
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Ad-Hoc|Any CPU.ActiveCfg = Release|iPhone
295+
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Ad-Hoc|Any CPU.Build.0 = Release|iPhone
295296
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
296297
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Ad-Hoc|ARM64.ActiveCfg = Ad-Hoc|iPhone
297298
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
@@ -312,6 +313,7 @@ Global
312313
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.AppStore|x64.ActiveCfg = AppStore|iPhone
313314
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.AppStore|x86.ActiveCfg = AppStore|iPhone
314315
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Debug|Any CPU.ActiveCfg = Debug|iPhone
316+
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Debug|Any CPU.Build.0 = Debug|iPhone
315317
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Debug|ARM.ActiveCfg = Debug|iPhone
316318
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Debug|ARM64.ActiveCfg = Debug|iPhone
317319
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Debug|iPhone.ActiveCfg = Debug|iPhone
@@ -323,6 +325,7 @@ Global
323325
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Debug|x64.ActiveCfg = Debug|iPhone
324326
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Debug|x86.ActiveCfg = Debug|iPhone
325327
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Release|Any CPU.ActiveCfg = Release|iPhone
328+
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Release|Any CPU.Build.0 = Release|iPhone
326329
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Release|ARM.ActiveCfg = Release|iPhone
327330
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Release|ARM64.ActiveCfg = Release|iPhone
328331
{BCF99165-4ADE-4FA1-8515-018C3D41F2BF}.Release|iPhone.ActiveCfg = Release|iPhone
@@ -399,6 +402,8 @@ Global
399402
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Debug|x86.Build.0 = Debug|x86
400403
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Debug|x86.Deploy.0 = Debug|x86
401404
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Release|Any CPU.ActiveCfg = Release|x86
405+
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Release|Any CPU.Build.0 = Release|x86
406+
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Release|Any CPU.Deploy.0 = Release|x86
402407
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Release|ARM.ActiveCfg = Release|ARM
403408
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Release|ARM.Build.0 = Release|ARM
404409
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Release|ARM.Deploy.0 = Release|ARM
@@ -414,8 +419,8 @@ Global
414419
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Release|x86.ActiveCfg = Release|x86
415420
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Release|x86.Build.0 = Release|x86
416421
{D3C1F581-1A60-4B19-A2B7-A4DDB2A0F794}.Release|x86.Deploy.0 = Release|x86
417-
{E2A7D9BB-95EC-44D2-BDBE-35C480EB9C87}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
418-
{E2A7D9BB-95EC-44D2-BDBE-35C480EB9C87}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
422+
{E2A7D9BB-95EC-44D2-BDBE-35C480EB9C87}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
423+
{E2A7D9BB-95EC-44D2-BDBE-35C480EB9C87}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
419424
{E2A7D9BB-95EC-44D2-BDBE-35C480EB9C87}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
420425
{E2A7D9BB-95EC-44D2-BDBE-35C480EB9C87}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
421426
{E2A7D9BB-95EC-44D2-BDBE-35C480EB9C87}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
@@ -510,6 +515,7 @@ Global
510515
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.AppStore|x86.ActiveCfg = Release|iPhoneSimulator
511516
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.AppStore|x86.Build.0 = Release|iPhoneSimulator
512517
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
518+
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
513519
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
514520
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator
515521
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Debug|iPhone.ActiveCfg = Debug|iPhoneSimulator
@@ -519,6 +525,7 @@ Global
519525
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
520526
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
521527
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
528+
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
522529
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
523530
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator
524531
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Release|iPhone.ActiveCfg = Release|iPhoneSimulator
@@ -527,8 +534,8 @@ Global
527534
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Release|NuGet.ActiveCfg = Release|iPhoneSimulator
528535
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Release|x64.ActiveCfg = Release|iPhoneSimulator
529536
{3465A672-7FAA-49F6-A902-9935DA03D0BD}.Release|x86.ActiveCfg = Release|iPhoneSimulator
530-
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
531-
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
537+
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
538+
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
532539
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
533540
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
534541
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
@@ -591,8 +598,8 @@ Global
591598
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Release|x64.Build.0 = Release|Any CPU
592599
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Release|x86.ActiveCfg = Release|Any CPU
593600
{02DA3557-9634-4F4A-BDDA-3CBB4D177FA8}.Release|x86.Build.0 = Release|Any CPU
594-
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
595-
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
601+
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
602+
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
596603
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
597604
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
598605
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
@@ -655,8 +662,8 @@ Global
655662
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Release|x64.Build.0 = Release|Any CPU
656663
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Release|x86.ActiveCfg = Release|Any CPU
657664
{7FA6FBE0-F56C-4600-A52D-FF6A1B393FA3}.Release|x86.Build.0 = Release|Any CPU
658-
{140C9950-099A-44E2-8627-9644733D6C3F}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
659-
{140C9950-099A-44E2-8627-9644733D6C3F}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
665+
{140C9950-099A-44E2-8627-9644733D6C3F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
666+
{140C9950-099A-44E2-8627-9644733D6C3F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
660667
{140C9950-099A-44E2-8627-9644733D6C3F}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
661668
{140C9950-099A-44E2-8627-9644733D6C3F}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
662669
{140C9950-099A-44E2-8627-9644733D6C3F}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU

‎build/azure-pipelines.yml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
include:
44
- main
55

6-
resources:
7-
containers:
8-
- container: windows
9-
image: nventive/vs_build-tools:17.2.5
10-
116
variables:
127
- name: NUGET_VERSION
138
value: 6.2.0
@@ -17,6 +12,10 @@ variables:
1712
value: Packages
1813
- name: SolutionFileName # Example: MyApplication.sln
1914
value: GeolocatorService.sln
15+
- name: IsReleaseBranch # Should this branch name use the release stage
16+
value: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
17+
- name: windowsHostedAgentImage
18+
value: 'windows-2022'
2019

2120
stages:
2221
- stage: Build
@@ -31,31 +30,29 @@ stages:
3130
GeneratePackageOnBuild: true
3231

3332
pool:
34-
name: 'windows 2022'
33+
vmImage: $(windowsHostedAgentImage)
3534

3635
variables:
3736
- name: PackageOutputPath # Path where nuget packages will be copied to.
3837
value: $(Build.ArtifactStagingDirectory)
3938

4039
workspace:
41-
clean: all # Cleanup the workspaca before starting
42-
43-
container: windows
40+
clean: all # Cleanup the workspace before starting
4441

4542
steps:
4643
- template: stage-build.yml
4744

4845
- stage: Release
49-
# Only release when the build is not for a Pull Request.
50-
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
46+
# Only release when the build is not for a Pull Request and branch name fits
47+
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['IsReleaseBranch'], 'true'))
5148
jobs:
52-
- job: Publish_NuGet_Internal
49+
- job: Publish_NuGet_External
5350

5451
pool:
55-
name: 'windows 2022'
52+
vmImage: $(windowsHostedAgentImage)
5653

5754
workspace:
58-
clean: all # Cleanup the workspaca before starting
55+
clean: all # Cleanup the workspace before starting
5956

6057
steps:
61-
- template: stage-release.yml
58+
- template: stage-release.yml

‎build/stage-build.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,19 @@
1111
displayName: 'Calculate version'
1212

1313
- task: DotNetCoreCLI@2
14-
displayName: 'Install dotnet 6 workloads'
14+
displayName: 'Install dotnet 8 workloads'
1515
inputs:
1616
command: 'custom'
1717
custom: 'workload'
1818
arguments: 'install android ios macos maccatalyst'
1919

20+
- task: JavaToolInstaller@0
21+
displayName: "Install Java SDK 11"
22+
inputs:
23+
versionSpec: '11'
24+
jdkArchitectureOption: 'x64'
25+
jdkSourceOption: 'PreInstalled'
26+
2027
- task: MSBuild@1
2128
displayName: 'Restore solution packages'
2229
inputs:

src/GeolocatorService.Shared/LocationResult.cs renamed to src/GeolocatorService.Abstractions/LocationResult.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
using Windows.Devices.Geolocation;
5-
6-
namespace GeolocatorService
1+
namespace GeolocatorService
72
{
83
/// <summary>
94
/// This represents the result of trying to obtain a location.

‎src/GeolocatorService.Reactive.Uno.WinUI/GeolocatorService.Reactive.Uno.WinUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22
<PropertyGroup>
33
<TargetFrameworks>net8.0;net8.0-ios;net8.0-android;net8.0-windows10.0.22621.0;net8.0-macos</TargetFrameworks>
4-
<LangVersion>13.0</LangVersion>
4+
<LangVersion>12.0</LangVersion>
55
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
66
<GenerateLibraryLayout>true</GenerateLibraryLayout>
77
<RootNamespace>GeolocatorService</RootNamespace>

‎src/GeolocatorService.Shared/GeolocatorService.Shared.projitems‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<Compile Include="$(MSBuildThisFileDirectory)GeocoordinateExtensions.cs" />
1313
<Compile Include="$(MSBuildThisFileDirectory)GeolocatorService.cs" />
1414
<Compile Include="$(MSBuildThisFileDirectory)GeolocatorServiceExtensions.cs" />
15-
<Compile Include="$(MSBuildThisFileDirectory)LocationResult.cs" />
1615
<Compile Include="$(MSBuildThisFileDirectory)MockedLocationService.cs" />
1716
</ItemGroup>
1817
</Project>

‎src/GeolocatorService.Shared/GeolocatorServiceExtensions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Threading;
33
using System.Threading.Tasks;
4-
using Windows.Devices.Geolocation;
54

65
namespace GeolocatorService
76
{

‎src/GeolocatorService.Uno.WinUI/GeolocatorService.Uno.WinUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22
<PropertyGroup>
33
<TargetFrameworks>net8.0;net8.0-ios;net8.0-android;net8.0-windows10.0.22621.0;net8.0-macos</TargetFrameworks>
4-
<LangVersion>13.0</LangVersion>
4+
<LangVersion>12.0</LangVersion>
55
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
66
<GenerateLibraryLayout>true</GenerateLibraryLayout>
77
<RootNamespace>GeolocatorService</RootNamespace>

0 commit comments

Comments
 (0)