Adjust namespaces

.vsts-ci.macOS.yml

@@ -2,14 +2,10 @@ jobs:
 - job: macOS
 
   pool:
-    name: Default
-    demands:
-    - Agent.OS -equals Darwin
-    - Xamarin.macOS -equals Stable
+    vmImage: 'macOS-10.15'
 
   variables:
     NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
-    VersionCodeOffset: 400559 # last value for the APK release
 
   steps:
   - task: UseDotNet@2
@@ -28,17 +24,6 @@ jobs:
       resultFile: '$(Build.ArtifactStagingDirectory)/result.json'
       nugetUpdaterVersion: 2.0.2
       packageAuthor: nventive
-  
-  #- bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh 5_18_1"
-  #  displayName: Select Xamarin Version
-  
-  - bash: |
-      shopt -s nullglob
-      function join_by { local IFS="$1"; shift; echo "$*"; }
-      lib_path=$(join_by ';' $(Agent.WorkFolder)/_tasks/GitVersion*/4.0.*/lib/osx)
-      echo LD_LIBRARY_PATH: $lib_path
-      echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$lib_path"
-    displayName: Update LD_LIBRARY_PATH for GitVersion
 
   - task: GitVersion@5
     inputs:
@@ -86,7 +71,7 @@ jobs:
       msbuildLocationMethod: version
       msbuildVersion: latest
       msbuildArchitecture: x86
-      msbuildArguments: /r  /p:BuildPlatformTarget=macOS /bl:$(build.artifactstagingdirectory)/build.binlog 
+      msbuildArguments: /r  /p:BuildPlatformTarget=iPhoneSimulator /bl:$(build.artifactstagingdirectory)/build.binlog 
       clean: false
       maximumCpuCount: true
       restoreNugetPackages: false
@@ -99,7 +84,7 @@ jobs:
       msbuildLocationMethod: version
       msbuildVersion: latest
       msbuildArchitecture: x86
-      msbuildArguments: /r /p:Configuration=Release /p:Platform=iPhone /bl:$(build.artifactstagingdirectory)/build.binlog  "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" 
+      msbuildArguments: /r /p:Configuration=Release /p:Platform=iPhoneSimulator /bl:$(build.artifactstagingdirectory)/build.binlog "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION" 
       clean: false
       maximumCpuCount: true
       restoreNugetPackages: false
@@ -109,7 +94,7 @@ jobs:
   - task: CopyFiles@2
     displayName: 'Publish macOS Binaries'
     inputs:
-      SourceFolder: $(build.sourcesdirectory)/src/Calculator.macOS/bin/iPhone/Release
+      SourceFolder: $(build.sourcesdirectory)/src/Calculator.macOS/bin/iPhoneSimulator/Release
       Contents: '*.ipa'
       TargetFolder: $(build.artifactstagingdirectory)
       CleanTargetFolder: false

.vsts-ci.yml

@@ -1,3 +1,4 @@
 jobs:
 - template: .vsts-ci.Windows.yml
 - template: .vsts-ci.Linux.yml
+- template: .vsts-ci.macOS.yml

src/Calculator.macOS/AppDelegate.cs

@@ -1,7 +1,7 @@
 using AppKit;
 using Foundation;
 
-namespace calculator.macOS
+namespace WindowsCalculator.MacOS
 {
 
 }

src/Calculator.macOS/Calculator.macOS.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -28,17 +28,21 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <Profiling>true</Profiling>
-    <HttpClientHandler></HttpClientHandler>
-    <LinkMode></LinkMode>
-    <XamMacArch></XamMacArch>
-    <NoWarn></NoWarn>
+    <HttpClientHandler>
+    </HttpClientHandler>
+    <LinkMode>
+    </LinkMode>
+    <XamMacArch>
+    </XamMacArch>
+    <NoWarn>Uno0001</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugSymbols>false</DebugSymbols>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
-    <DefineConstants></DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <EnableCodeSigning>false</EnableCodeSigning>
@@ -48,9 +52,11 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <LinkMode>SdkOnly</LinkMode>
-    <HttpClientHandler></HttpClientHandler>
-    <XamMacArch></XamMacArch>
-    <NoWarn></NoWarn>
+    <HttpClientHandler>
+    </HttpClientHandler>
+    <XamMacArch>
+    </XamMacArch>
+    <NoWarn>Uno0001</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -86,8 +92,6 @@
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Resources\" />
-    <Folder Include="Resources\Fonts\" />
     <Folder Include="Assets.xcassets\unologo.imageset\" />
   </ItemGroup>
   <ItemGroup>
@@ -98,7 +102,7 @@
   <ItemGroup>
     <Compile Include="..\AssemblyVersion.macOS.cs">
       <Link>Properties\AssemblyVersion.macOS.cs</Link>
-    </Compile>  
+    </Compile>
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />
     <Compile Include="MenuHelper.cs" />

src/Calculator.macOS/Main.cs

@@ -1,7 +1,7 @@
 using AppKit;
 using CalculatorApp;
 
-namespace calculator.macOS
+namespace WindowsCalculator.MacOS
 {
 	static class MainClass
 	{

src/Calculator.macOS/MenuHelper.cs

@@ -1,7 +1,7 @@
 using System;
 using AppKit;
 
-namespace calculator.macOS
+namespace WindowsCalculator.MacOS
 {
 	public static class MenuHelper
 	{

src/Calculator.sln

@@ -34,6 +34,7 @@ EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Calculator.Shared\Calculator.Shared.projitems*{093428d1-ab83-4f1a-93e9-304b44a24d1f}*SharedItemsImports = 4
+		Calculator.Shared\Calculator.Shared.projitems*{313fcf91-a6db-4585-a23e-49bbeef4784d}*SharedItemsImports = 4
 		Calculator.Shared\Calculator.Shared.projitems*{53337466-6e79-45f3-a650-1bfb93cc19b0}*SharedItemsImports = 5
 		Calculator.Shared\Calculator.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
 		Calculator.Shared\Calculator.Shared.projitems*{6aa5ec60-6865-4ba8-9f09-ee02add025e2}*SharedItemsImports = 4