diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec index 3de6f8a7e514..2ca5089d562f 100644 --- a/.nuspec/Xamarin.Forms.nuspec +++ b/.nuspec/Xamarin.Forms.nuspec @@ -233,18 +233,12 @@ - - - - - - @@ -288,23 +282,14 @@ - - - - - - - - - diff --git a/.nuspec/Xamarin.Forms.targets b/.nuspec/Xamarin.Forms.targets index 2a3e666293e0..4a896455c106 100644 --- a/.nuspec/Xamarin.Forms.targets +++ b/.nuspec/Xamarin.Forms.targets @@ -200,22 +200,14 @@ - $(FrameworkSDKRoot.Contains('/Versions/5')) - true - false Xamarin.Forms.Platform.iOS.dll Xamarin.Forms.Platform.macOS.dll - + $(MSBuildThisFileDirectory)\XCODE11\$(FrameworkDll) - - - $(MSBuildThisFileDirectory)\XCODE10\$(FrameworkDll) - - diff --git a/DualScreen/DualScreen.UWP/DualScreen.UWP.csproj b/DualScreen/DualScreen.UWP/DualScreen.UWP.csproj index 535c5d46a35c..9e301e85a26a 100644 --- a/DualScreen/DualScreen.UWP/DualScreen.UWP.csproj +++ b/DualScreen/DualScreen.UWP/DualScreen.UWP.csproj @@ -151,8 +151,5 @@ DualScreen - - 14.0 - \ No newline at end of file diff --git a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj index 8f1b3df7ff71..e807ebb4b3bc 100644 --- a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj +++ b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj @@ -16,7 +16,6 @@ True Resources\Resource.Designer.cs Off - v9.0 v10.0 $(AndroidTargetFrameworkVersion) Properties\AndroidManifest.xml diff --git a/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj b/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj index 0e0867bcb864..4554a64295f4 100644 --- a/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj +++ b/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj @@ -10,7 +10,7 @@ Embedding.iOS Resources Embedding.iOS - __XCODE11__;$(DefineConstants); + __XCODE11__;$(DefineConstants); true @@ -88,7 +88,7 @@ {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} Xamarin.Forms.Core - + {8a75b1dc-ceed-4b1b-8675-a7dffd1e6de4} Xamarin.Forms.Material.iOS false diff --git a/Environment.Build.props b/Environment.Build.props index 2a495fc2f62e..0e1614ff9f92 100644 --- a/Environment.Build.props +++ b/Environment.Build.props @@ -32,16 +32,9 @@ true - - $(FrameworkSDKRoot.Contains('/Versions/5')) - true - false - - - MonoAndroid90; - MonoAndroid90;MonoAndroid10.0; + MonoAndroid90;MonoAndroid10.0; diff --git a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj index 011e8fe85fa3..6a6e0cd896df 100644 --- a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj +++ b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj @@ -16,7 +16,6 @@ true Resources\Resource.Designer.cs Off - v9.0 v10.0 Properties\AndroidManifest.xml Properties\AndroidManifest28.xml diff --git a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj index d598c025298d..a9011a2c3e3b 100644 --- a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj +++ b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj @@ -15,7 +15,7 @@ True - __XCODE11__;$(DefineConstants); + __XCODE11__;$(DefineConstants); true @@ -79,7 +79,7 @@ {57b8b73d-c3b5-4c42-869e-7b2f17d354ac} Xamarin.Forms.Core - + {8a75b1dc-ceed-4b1b-8675-a7dffd1e6de4} Xamarin.Forms.Material.iOS false diff --git a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj index a401bd041091..a6f7432238a6 100644 --- a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj +++ b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj @@ -10,10 +10,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - diff --git a/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj index e292bec2f54d..81e73d409d50 100644 --- a/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj +++ b/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj @@ -57,9 +57,6 @@ - - - diff --git a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets index 680415c9bd34..f5a884d83622 100644 --- a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets +++ b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets @@ -1,6 +1,5 @@ - - + diff --git a/Xamarin.Forms.ControlGallery.Android/Nuget2019.Build.targets b/Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets similarity index 100% rename from Xamarin.Forms.ControlGallery.Android/Nuget2019.Build.targets rename to Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets diff --git a/Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets b/Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets deleted file mode 100644 index d5c7b72cec8c..000000000000 --- a/Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0.4.11 - - - \ No newline at end of file diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj index 62f584f64d1f..cdafb7704078 100644 --- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj +++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj @@ -16,7 +16,6 @@ true Resources\Resource.Designer.cs Off - v9.0 v10.0 $(AndroidTargetFrameworkVersion) Properties\AndroidManifest.xml @@ -67,10 +66,9 @@ SdkOnly True true - d8 - r8 - false - true + d8 + r8 + false Full diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj index 58504fa3a3bc..e16aea0f38fd 100644 --- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj +++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj @@ -13,7 +13,7 @@ XamarinFormsControlGalleryiOS ..\ true - __XCODE11__;$(DefineConstants); + __XCODE11__;$(DefineConstants); true @@ -187,7 +187,7 @@ false false - + {8A75B1DC-CEED-4B1B-8675-A7DFFD1E6DE4} Xamarin.Forms.Material.iOS false diff --git a/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj b/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj index 78f1ae711ed4..ac8c425fe5ae 100644 --- a/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj +++ b/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj @@ -19,10 +19,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj index d0639e7dd3ef..d71da3ded9b2 100644 --- a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj +++ b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj @@ -9,10 +9,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - diff --git a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj index 722bb30c526b..6d31a25689fb 100644 --- a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj +++ b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj @@ -65,9 +65,6 @@ - - - diff --git a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj index a6700d3ff586..2efb28bf55b6 100644 --- a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj +++ b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj @@ -11,10 +11,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - diff --git a/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj b/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj index 46e99d734a97..af7d99c25651 100644 --- a/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj +++ b/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj @@ -94,9 +94,6 @@ - - - diff --git a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj index a4b578b78d5b..4bade01f5c40 100644 --- a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj +++ b/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj @@ -12,10 +12,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj index dce33c17e663..7fa8b250a0ac 100644 --- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj +++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj @@ -11,10 +11,6 @@ true - - false - bin\$(Configuration)\$(TargetFramework) - diff --git a/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj b/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj index 5b8a77442655..b155160fe9df 100644 --- a/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj +++ b/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj @@ -61,11 +61,7 @@ - - __XCODE10__;$(DefineConstants); - $(OutputPath)\2017 - - + __XCODE11__;$(DefineConstants); diff --git a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj index 7513b7686a0e..917626778cca 100644 --- a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj +++ b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj @@ -5,7 +5,6 @@ true Debug AnyCPU - true AnyCPU diff --git a/Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj b/Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj index 4198f07699d3..e95d742c4b8f 100644 --- a/Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj +++ b/Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj @@ -30,11 +30,7 @@ prompt 4 - - $(DefineConstants);__XCODE10__ - $(OutputPath)\2017 - - + $(DefineConstants);__XCODE11__ @@ -86,8 +82,5 @@ 3.12.0 - - - \ No newline at end of file diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj index 2d543173fd82..48396599e109 100644 --- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj +++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj @@ -34,11 +34,7 @@ - - $(DefineConstants);__XCODE10__ - $(OutputPath)\2017 - - + $(DefineConstants);__XCODE11__ @@ -314,9 +310,6 @@ Xamarin.Forms.Core - - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dc8243e1d7c4..027d901b8ad2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -205,23 +205,6 @@ stages: vmPool: $[coalesce(variables.macAndroid2019VmPool, 'Azure Pipelines')] vmImage: $[coalesce(variables.macAndroid2019VmImage, 'macOS-10.15')] provisionatorPath : 'build/provisioning/provisioning.csx' - buildForVS2017: false - buildConfiguration: $(DefaultBuildConfiguration) - - - stage: android_2017 - displayName: Build Android 2017 - condition: eq(variables['System.TeamProject'], 'devdiv') - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}: - dependsOn: windows - ${{ if eq(variables['System.TeamProject'], 'public') }}: - dependsOn: [] - jobs: - - template: build/steps/build-android.yml - parameters: - vmPool: $[coalesce(variables.macAndroid2017VmPool, 'Azure Pipelines')] - vmImage: 'macOS-10.14' - provisionatorPath : 'build/provisioning/provisioning.csx' - buildForVS2017: true buildConfiguration: $(DefaultBuildConfiguration) - stage: build_osx @@ -248,34 +231,6 @@ stages: buildConfiguration: $(DefaultBuildConfiguration) iOSCertSecureFileName: 'Xamarin Forms iOS Certificate.p12' iOSProvisioningSecureFileName: 'Xamarin Forms iOS Provisioning.mobileprovision' - buildForVS2017: 'false' - steps: - - template: build/steps/build-osx.yml - - - stage: build_osx_2017 - displayName: Build OSX 2017 - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}: - dependsOn: windows - ${{ if eq(variables['System.TeamProject'], 'public') }}: - dependsOn: [] - jobs: - - job: osx - workspace: - clean: all - displayName: OSX Phase 2017 - pool: - name: $(osx2017VmPool) - vmImage: 'macOS-10.14' - demands: - - sh - - Xamarin.iOS - variables: - provisionator.osxPath : 'build/provisioning/provisioning.csx' - buildConfiguration: $(DefaultBuildConfiguration) - slnPath: $(SolutionFile) - iOSCertSecureFileName: 'Xamarin Forms iOS Certificate.p12' - iOSProvisioningSecureFileName: 'Xamarin Forms iOS Provisioning.mobileprovision' - buildForVS2017: 'true' steps: - template: build/steps/build-osx.yml diff --git a/build.cake b/build.cake index 4511e31312ba..5e38a0c9d19e 100644 --- a/build.cake +++ b/build.cake @@ -43,9 +43,6 @@ var releaseChannelArg = Argument("CHANNEL", "Stable"); releaseChannelArg = EnvironmentVariable("CHANNEL") ?? releaseChannelArg; var teamProject = Argument("TeamProject", ""); -var buildForVS2017Arg = EnvironmentVariable("buildForVS2017") ?? Argument("buildForVS2017", "false"); -bool buildForVS2017 = Convert.ToBoolean(buildForVS2017Arg); - string artifactStagingDirectory = Argument("Build_ArtifactStagingDirectory", (string)null) ?? EnvironmentVariable("Build.ArtifactStagingDirectory") ?? EnvironmentVariable("Build_ArtifactStagingDirectory") ?? "."; var ANDROID_HOME = EnvironmentVariable("ANDROID_HOME") ?? (IsRunningOnWindows () ? "C:\\Program Files (x86)\\Android\\android-sdk\\" : ""); @@ -58,9 +55,6 @@ Information ("ANDROID_RENDERERS: {0}", ANDROID_RENDERERS); Information ("configuration: {0}", configuration); Information ("ANDROID_HOME: {0}", ANDROID_HOME); Information ("Team Project: {0}", teamProject); -Information ("buildForVS2017: {0}", buildForVS2017); -Information ("EnvironmentVariable buildForVS2017: {0}", EnvironmentVariable("buildForVS2017")); -Information ("Argument buildForVS2017: {0}", Argument("buildForVS2017", "not set")); var releaseChannel = ReleaseChannel.Stable; if(releaseChannelArg == "Preview") @@ -78,17 +72,7 @@ string monoPatchVersion = ""; string monoMajorVersion = ""; string monoVersion = ""; -if(buildForVS2017) -{ - // VS2017 - monoMajorVersion = "5.18.1"; - monoPatchVersion = ""; - androidSDK_macos = "https://aka.ms/xamarin-android-commercial-d15-9-macos"; - iOSSDK_macos = $"https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode10.2/9c8d8e0a50e68d9abc8cd48fcd47a669e981fcc9/53/package/xamarin.ios-12.4.0.64.pkg"; - macSDK_macos = $"https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode10.2/9c8d8e0a50e68d9abc8cd48fcd47a669e981fcc9/53/package/xamarin.mac-5.4.0.64.pkg"; - -} -else if(releaseChannel == ReleaseChannel.Stable) +if(releaseChannel == ReleaseChannel.Stable) { if(IsXcodeVersionOver("11.4")) { @@ -121,23 +105,15 @@ if(String.IsNullOrWhiteSpace(monoSDK_macos)) } } -string androidSDK_windows = ""; -string iOSSDK_windows = ""; -string monoSDK_windows = ""; -string macSDK_windows = ""; +string androidSDK_windows = EnvironmentVariable("ANDROID_SDK_WINDOWS", ""); +string iOSSDK_windows = EnvironmentVariable("IOS_SDK_WINDOWS", ""); +string monoSDK_windows = EnvironmentVariable("MONO_SDK_WINDOWS", ""); +string macSDK_windows = EnvironmentVariable("MAC_SDK_WINDOWS", ""); -if(!buildForVS2017) -{ - androidSDK_macos = EnvironmentVariable("ANDROID_SDK_MAC", androidSDK_macos); - iOSSDK_macos = EnvironmentVariable("IOS_SDK_MAC", iOSSDK_macos); - monoSDK_macos = EnvironmentVariable("MONO_SDK_MAC", monoSDK_macos); - macSDK_macos = EnvironmentVariable("MAC_SDK_MAC", macSDK_macos); - - androidSDK_windows = EnvironmentVariable("ANDROID_SDK_WINDOWS", ""); - iOSSDK_windows = EnvironmentVariable("IOS_SDK_WINDOWS", ""); - monoSDK_windows = EnvironmentVariable("MONO_SDK_WINDOWS", ""); - macSDK_windows = EnvironmentVariable("MAC_SDK_WINDOWS", ""); -} +androidSDK_macos = EnvironmentVariable("ANDROID_SDK_MAC", androidSDK_macos); +iOSSDK_macos = EnvironmentVariable("IOS_SDK_MAC", iOSSDK_macos); +monoSDK_macos = EnvironmentVariable("MONO_SDK_MAC", monoSDK_macos); +macSDK_macos = EnvironmentVariable("MAC_SDK_MAC", macSDK_macos); string androidSDK = IsRunningOnWindows() ? androidSDK_windows : androidSDK_macos; string monoSDK = IsRunningOnWindows() ? monoSDK_windows : monoSDK_macos; @@ -335,22 +311,6 @@ Task("BuildForNuget") .WithProperty("DisableEmbeddedXbf", "false") .WithProperty("EnableTypeInfoReflection", "false")); - msbuildSettings = GetMSBuildSettings(); - msbuildSettings.BinaryLogger = binaryLogger; - binaryLogger.FileName = $"{artifactStagingDirectory}/ios-{configuration}-csproj.binlog"; - MSBuild("./Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj", - msbuildSettings - .WithTarget("rebuild") - .WithProperty("USE2017", "true")); - - msbuildSettings = GetMSBuildSettings(); - msbuildSettings.BinaryLogger = binaryLogger; - binaryLogger.FileName = $"{artifactStagingDirectory}/macos-{configuration}-csproj.binlog"; - MSBuild("./Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.MacOS.csproj", - msbuildSettings - .WithTarget("rebuild") - .WithProperty("USE2017", "true")); - } catch(Exception) { diff --git a/build/steps/build-android.yml b/build/steps/build-android.yml index b3f09cdf63a5..707e50d3e78f 100644 --- a/build/steps/build-android.yml +++ b/build/steps/build-android.yml @@ -29,33 +29,30 @@ jobs: android_legacy: renderers: 'LEGACY' outputfolder: 'legacyRenderers' - buildForVS2017: ${{ parameters.buildForVS2017 }} android_preAppCompat: renderers: 'PREAPPCOMPAT' outputfolder: 'preAppCompat' - buildForVS2017: ${{ parameters.buildForVS2017 }} android_newRenderers: renderers: 'FAST' outputfolder: 'newRenderers' - buildForVS2017: ${{ parameters.buildForVS2017 }} steps: - checkout: self clean: true - task: xamops.azdevex.provisionator-task.provisionator@1 displayName: 'Provisionator' - condition: and(eq(variables['provisioning'], 'true'), eq(variables['buildForVS2017'], 'false')) + condition: eq(variables['provisioning'], 'true') inputs: provisioning_script: ${{ parameters.provisionatorPath }} provisioning_extra_args: ${{ parameters.provisionator.extraArguments }} - task: Bash@3 displayName: 'Cake Provision' - condition: or(eq(variables['provisioningCake'], 'true'), eq(variables['buildForVS2017'], 'true')) + condition: eq(variables['provisioningCake'], 'true') inputs: targetType: 'filePath' filePath: 'build.sh' - arguments: --target provision --TeamProject="$(System.TeamProject)" --buildForVS2017=$(buildForVS2017) + arguments: --target provision --TeamProject="$(System.TeamProject)" - task: UseDotNet@2 displayName: 'Install .net core $(DOTNET_VERSION)' @@ -105,7 +102,7 @@ jobs: inputs: solution: ${{ parameters.androidProjectPath }} configuration: ${{ parameters.buildConfiguration }} - msbuildArguments: '/t:"Rebuild;SignAndroidPackage" /p:ANDROID_RENDERERS="$(renderers)" /bl:$(Build.ArtifactStagingDirectory)/android-$(renderers)-2017_$(buildForVS2017).binlog' + msbuildArguments: '/t:"Rebuild;SignAndroidPackage" /p:ANDROID_RENDERERS="$(renderers)" /bl:$(Build.ArtifactStagingDirectory)/android-$(renderers).binlog' - task: CopyFiles@2 displayName: 'Copy $(renderers)' @@ -118,22 +115,13 @@ jobs: - task: CopyFiles@2 displayName: 'Copy Android apk $(renderers) for UITest' - condition: eq(variables['buildForVS2017'], 'false') + condition: always() inputs: Contents: | Xamarin.Forms.ControlGallery.Android/$(outputfolder)/$(ApkName) TargetFolder: '$(build.artifactstagingdirectory)/androidApp' CleanTargetFolder: true - - task: CopyFiles@2 - displayName: 'Copy Android apk $(renderers) for UITest 2017' - condition: eq(variables['buildForVS2017'], 'true') - inputs: - Contents: | - Xamarin.Forms.ControlGallery.Android/$(outputfolder)/$(ApkName) - TargetFolder: '$(build.artifactstagingdirectory)/androidApp_2017' - CleanTargetFolder: true - - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: AndroidApps' condition: always() diff --git a/build/steps/build-osx.yml b/build/steps/build-osx.yml index 1484b220b1a7..55a8564abcf6 100644 --- a/build/steps/build-osx.yml +++ b/build/steps/build-osx.yml @@ -4,13 +4,13 @@ steps: - task: xamops.azdevex.provisionator-task.provisionator@1 displayName: 'Provision Xcode' - condition: and(ne(variables['REQUIRED_XCODE'], ''), eq(variables['buildForVS2017'], 'false')) + condition: ne(variables['REQUIRED_XCODE'], '') inputs: provisioning_script: 'build/provisioning/xcode.csx' - task: xamops.azdevex.provisionator-task.provisionator@1 displayName: 'Provisionator' - condition: and(eq(variables['provisioning'], 'true'), eq(variables['buildForVS2017'], 'false')) + condition: eq(variables['provisioning'], 'true') inputs: provisioning_script: $(provisionator.osxPath) provisioning_extra_args: $(provisionator.extraArguments) --v @@ -19,15 +19,15 @@ steps: echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/" echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx" displayName: 'Setup SDK Paths' - condition: and(ne(variables['osx2019VmPool'], 'Azure Pipelines'), eq(variables['buildForVS2017'], 'false')) + condition: ne(variables['osx2019VmPool'], 'Azure Pipelines') - task: Bash@3 displayName: 'Cake Provision' - condition: or(eq(variables['provisioningCake'], 'true'), eq(variables['buildForVS2017'], 'true')) + condition: eq(variables['provisioningCake'], 'true') inputs: targetType: 'filePath' filePath: 'build.sh' - arguments: --target provision --TeamProject="$(System.TeamProject)" --buildForVS2017=$(buildForVS2017) + arguments: --target provision --TeamProject="$(System.TeamProject)" - task: UseDotNet@2 displayName: 'Install .net core $(DOTNET_VERSION)' @@ -87,25 +87,25 @@ steps: inputs: solution: 'Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj' configuration: $(buildConfiguration) - msbuildArguments: /bl:$(Build.ArtifactStagingDirectory)/ios-cg-2017_$(buildForVS2017).binlog /p:BuildIpa=true + msbuildArguments: /bl:$(Build.ArtifactStagingDirectory)/ios-cg.binlog /p:BuildIpa=true - task: MSBuild@1 displayName: 'Build iOS Tests' inputs: solution: 'Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj' configuration: $(buildConfiguration) - msbuildArguments: /bl:$(Build.ArtifactStagingDirectory)/ios-uitests-2017_$(buildForVS2017).binlog + msbuildArguments: /bl:$(Build.ArtifactStagingDirectory)/ios-uitests.binlog - task: MSBuild@1 displayName: 'Build Android Tests' inputs: solution: 'Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj' configuration: $(buildConfiguration) - msbuildArguments: /bl:$(Build.ArtifactStagingDirectory)/android-uitests-2017_$(buildForVS2017).binlog + msbuildArguments: /bl:$(Build.ArtifactStagingDirectory)/android-uitests.binlog - task: CopyFiles@2 displayName: 'Copy test-cloud.exe' - condition: eq(variables['buildForVS2017'], 'false') + condition: always() inputs: Contents: '**/Xamarin.UITest.*/tools/test-cloud.exe' TargetFolder: '$(build.artifactstagingdirectory)/testcloud' @@ -115,7 +115,7 @@ steps: - task: CopyFiles@2 displayName: 'Copy iOS Files for UITest' - condition: eq(variables['buildForVS2017'], 'false') + condition: always() inputs: Contents: | **/$(IpaName) @@ -129,25 +129,9 @@ steps: CleanTargetFolder: true flattenFolders: true - - task: CopyFiles@2 - displayName: 'Copy iOS Files for UITest 2017' - condition: eq(variables['buildForVS2017'], 'true') - inputs: - Contents: | - **/$(IpaName) - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/Newtonsoft.Json.* - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/nunit.* - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/NUnit3.* - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/Plugin.* - Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/Xamarin.* - - TargetFolder: '$(build.artifactstagingdirectory)/ios_2017' - CleanTargetFolder: true - flattenFolders: true - - task: CopyFiles@2 displayName: 'Copy Android Files for UITest' - condition: eq(variables['buildForVS2017'], 'false') + condition: always() inputs: Contents: | Xamarin.Forms.Core.Android.UITests/bin/$(BuildConfiguration)/Newtonsoft.Json.*