diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec
index a87971235..d844da6ca 100644
--- a/.nuspec/Xamarin.Forms.nuspec
+++ b/.nuspec/Xamarin.Forms.nuspec
@@ -58,7 +58,6 @@
-
@@ -88,7 +87,6 @@
-
@@ -207,9 +205,13 @@
-
-
-
+
+
+
+
+
+
+
@@ -296,8 +298,9 @@
-
+
+
diff --git a/.nuspec/Xamarin.Forms.targets b/.nuspec/Xamarin.Forms.targets
index 3e4c959b3..2a3e66629 100644
--- a/.nuspec/Xamarin.Forms.targets
+++ b/.nuspec/Xamarin.Forms.targets
@@ -183,7 +183,41 @@
+
+
+
+
+
+ IncludeCorrectXIOSReference;
+ $(CoreCompileDependsOn);
+
+
+ IncludeCorrectXIOSReference;
+ $(PrepareForBuildDependsOn);
+
+
+
+
+
+ $(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/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj
index 779a99ae1..a5cd4c8a4 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,6 +57,9 @@
+
+
+
diff --git a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
index d3c183a64..3612dd456 100644
--- a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
+++ b/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
@@ -65,6 +65,9 @@
+
+
+
diff --git a/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj b/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
index 4d2ceff33..d62ae0b39 100644
--- a/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
+++ b/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
@@ -94,6 +94,9 @@
+
+
+
diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs
index afaf69bf5..3216901d0 100644
--- a/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs
+++ b/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs
@@ -473,10 +473,13 @@ namespace Xamarin.Forms.Platform.MacOS
(Source as ListViewDataSource)?.OnRowClicked();
}
+#if __XCODE11__
public override bool ValidateProposedFirstResponder(NSResponder responder, NSEvent forEvent)
{
return true;
}
+#endif
+
}
}
}
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj b/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj
index 62ec03372..7595b8596 100644
--- a/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj
+++ b/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj
@@ -1,5 +1,6 @@
+
macOS Backend for Xamarin.Forms
Xamarin.Forms.Platform.macOS
@@ -60,6 +61,13 @@
+
+ __XCODE10__;$(DefineConstants);
+ $(OutputPath)\2017
+
+
+ __XCODE11__;$(DefineConstants);
+
@@ -270,4 +278,7 @@
+
+
+
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
index 235ae4090..3ad66cd52 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
@@ -18,9 +18,11 @@ namespace Xamarin.Forms.Platform.iOS
{
if (Control == null)
{
+#if __XCODE11__
if(Forms.IsiOS13OrNewer)
SetNativeControl(new UIActivityIndicatorView(RectangleF.Empty) { ActivityIndicatorViewStyle = UIActivityIndicatorViewStyle.Medium });
else
+#endif
SetNativeControl(new UIActivityIndicatorView(RectangleF.Empty) { ActivityIndicatorViewStyle = UIActivityIndicatorViewStyle.Gray });
}
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
index 6a9af896c..3d6e2711e 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
@@ -619,14 +619,8 @@ namespace Xamarin.Forms.Platform.iOS
{
var barBackgroundColor = NavPage.BarBackgroundColor;
- if (!Forms.IsiOS13OrNewer)
- {
- // Set navigation bar background color
- NavigationBar.BarTintColor = barBackgroundColor == Color.Default
- ? UINavigationBar.Appearance.BarTintColor
- : barBackgroundColor.ToUIColor();
- }
- else
+#if __XCODE11__
+ if (Forms.IsiOS13OrNewer)
{
var navigationBarAppearance = new UINavigationBarAppearance();
@@ -642,6 +636,14 @@ namespace Xamarin.Forms.Platform.iOS
NavigationBar.StandardAppearance = navigationBarAppearance;
NavigationBar.ScrollEdgeAppearance = navigationBarAppearance;
}
+ else
+#endif
+ {
+ // Set navigation bar background color
+ NavigationBar.BarTintColor = barBackgroundColor == Color.Default
+ ? UINavigationBar.Appearance.BarTintColor
+ : barBackgroundColor.ToUIColor();
+ }
}
void UpdateBarTextColor()
@@ -669,6 +671,7 @@ namespace Xamarin.Forms.Platform.iOS
};
}
+#if __XCODE11__
if (Forms.IsiOS13OrNewer)
{
NavigationBar.CompactAppearance.TitleTextAttributes = titleTextAttributes;
@@ -681,6 +684,7 @@ namespace Xamarin.Forms.Platform.iOS
NavigationBar.ScrollEdgeAppearance.LargeTitleTextAttributes = largeTitleTextAttributes;
}
else
+#endif
{
NavigationBar.TitleTextAttributes = titleTextAttributes;
@@ -701,14 +705,16 @@ namespace Xamarin.Forms.Platform.iOS
if (statusBarColorMode == StatusBarTextColorMode.DoNotAdjust || barTextColor.Luminosity <= 0.5)
{
+#if __XCODE11__
// Use dark text color for status bar
if (Forms.IsiOS13OrNewer)
{
UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.DarkContent;
}
else
+#endif
{
- UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.Default;
+ UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.Default;
}
}
else
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs
index 7bf1723d1..651f0455b 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs
@@ -137,9 +137,11 @@ namespace Xamarin.Forms.Platform.iOS
{
UIColor backgroundColor;
+#if __XCODE11__
if (Forms.IsiOS13OrNewer)
backgroundColor = UIColor.SystemBackgroundColor;
else
+#endif
backgroundColor = UIColor.White;
if (Element.BackgroundColor != Color.Default)
diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
index 303d20a1a..b379d36db 100644
--- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
+++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
@@ -1,5 +1,6 @@
+
iOS Backend for Xamarin.Forms
Xamarin.Forms.Platform.iOS
@@ -17,7 +18,7 @@
true
false
bin\Debug
- DEBUG;
+ $(DefineConstants);DEBUG;
prompt
4
false
@@ -33,6 +34,13 @@
+
+ $(DefineConstants);__XCODE10__
+ $(OutputPath)\2017
+
+
+ $(DefineConstants);__XCODE11__
+
@@ -299,7 +307,10 @@
Xamarin.Forms.Core
+
+
+
-
\ No newline at end of file
+
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ea929db77..b807b2fdd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -65,9 +65,6 @@ jobs:
name: win
displayName: Build Windows Phase
vmImage: $(win2019VmImage)
- msbuildExtraArguments: '/nowarn:VSX1000'
- buildConfiguration: $(DefaultBuildConfiguration)
- buildPlatform: $(DefaultBuildPlatform)
provisionatorPath : 'build/provisioning/provisioning.csx'
- template: build/steps/build-android.yml
@@ -111,6 +108,12 @@ jobs:
- sh
- msbuild
- Xamarin.iOS
+ strategy:
+ matrix:
+ BuildForVS2017:
+ buildForVS2017: 'true'
+ BuildForVS2019:
+ buildForVS2017: 'false'
variables:
provisionator.osxPath : 'build/provisioning/provisioning.csx'
provisionator.signPath : 'build/provisioning/provisioning_sign.csx'
@@ -118,6 +121,7 @@ jobs:
slnPath: $(SolutionFile)
iOSCertSecureFileName: 'Xamarin Forms iOS Certificate.p12'
iOSProvisioningSecureFileName: 'Xamarin Forms iOS Provisioning.mobileprovision'
+ buildForVS2017: $(buildForVS2017)
steps:
- template: build/steps/build-osx.yml
diff --git a/build.cake b/build.cake
index 218f771a5..8567ae5e9 100644
--- a/build.cake
+++ b/build.cake
@@ -22,7 +22,7 @@ PowerShell:
#addin "nuget:?package=Cake.Android.Adb&version=3.0.0"
#addin "nuget:?package=Cake.Git&version=0.19.0"
#addin "nuget:?package=Cake.Android.SdkManager&version=3.0.2"
-#addin "nuget:?package=Cake.Boots&version=1.0.0.291"
+#addin "nuget:?package=Cake.Boots&version=1.0.2.421"
#addin "nuget:?package=Cake.FileHelpers&version=3.2.0"
//////////////////////////////////////////////////////////////////////
@@ -37,38 +37,64 @@ PowerShell:
var target = Argument("target", "Default");
var configuration = Argument("configuration", "Debug");
var packageVersion = Argument("packageVersion", "");
+var releaseChannelArg = Argument("releaseChannel", "Stable");
+releaseChannelArg = EnvironmentVariable("releaseChannel") ?? releaseChannelArg;
+var teamProject = Argument("TeamProject", "");
+bool buildForVS2017 = Convert.ToBoolean(Argument("buildForVS2017", "false"));
+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\\" : "");
-string monoMajorVersion = "5.18.1";
-string monoPatchVersion = "28";
-string monoVersion = $"{monoMajorVersion}.{monoPatchVersion}";
+string[] androidSdkManagerInstalls = new string[0];//new [] { "platforms;android-24", "platforms;android-28"};
-string monoSDK_windows = "";//$"https://download.mono-project.com/archive/{monoMajorVersion}/windows-installer/mono-{monoVersion}-x64-0.msi";
-string androidSDK_windows = "";//"https://aka.ms/xamarin-android-commercial-d15-9-windows";
-string iOSSDK_windows = "";//"https://download.visualstudio.microsoft.com/download/pr/71f33151-5db4-49cc-ac70-ba835a9f81e2/d256c6c50cd80ec0207783c5c7a4bc2f/xamarin.visualstudio.apple.sdk.4.12.3.83.vsix";
-string macSDK_windows = "";
-monoMajorVersion = "6.6.0";
-monoPatchVersion = "";
+Information ("Team Project: {0}", teamProject);
+Information ("buildForVS2017: {0}", buildForVS2017);
+
+var releaseChannel = ReleaseChannel.Stable;
+if(releaseChannelArg == "Preview")
+{
+ releaseChannel = ReleaseChannel.Preview;
+}
+
+Information ("Release Channel: {0}", releaseChannel);
+
+string androidSDK_macos = "";
+string monoSDK_macos = "";
+string iOSSDK_macos = "";
+string macSDK_macos = "";
+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";
+
+}
+
if(String.IsNullOrWhiteSpace(monoPatchVersion))
monoVersion = $"{monoMajorVersion}";
else
monoVersion = $"{monoMajorVersion}.{monoPatchVersion}";
+
+if(!String.IsNullOrWhiteSpace(monoVersion))
+{
+ monoSDK_macos = $"https://download.mono-project.com/archive/{monoMajorVersion}/macos-10-universal/MonoFramework-MDK-{monoVersion}.macos10.xamarin.universal.pkg";
+}
-string androidSDK_macos = "https://aka.ms/xamarin-android-commercial-d16-4-macos";
-string monoSDK_macos = $"https://download.mono-project.com/archive/{monoMajorVersion}/macos-10-universal/MonoFramework-MDK-{monoVersion}.macos10.xamarin.universal.pkg";
-string iOSSDK_macos = $"https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode11.3/5f802ef535488d12886f264b598b9c59ca2f2404/36/package/notarized/xamarin.ios-13.10.0.17.pkg";
-string macSDK_macos = $"https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode11.3/5f802ef535488d12886f264b598b9c59ca2f2404/36/package/notarized/xamarin.mac-6.10.0.17.pkg";
-string androidSDK = IsRunningOnWindows() ? androidSDK_windows : androidSDK_macos;
-string monoSDK = IsRunningOnWindows() ? monoSDK_windows : monoSDK_macos;
-string iosSDK = IsRunningOnWindows() ? iOSSDK_windows : iOSSDK_macos;
+string androidSDK = IsRunningOnWindows() ? "" : androidSDK_macos;
+string monoSDK = IsRunningOnWindows() ? "" : monoSDK_macos;
+string iosSDK = IsRunningOnWindows() ? "" : iOSSDK_macos;
string macSDK = IsRunningOnWindows() ? "" : macSDK_macos;
-string[] androidSdkManagerInstalls = new string[0];//new [] { "platforms;android-24", "platforms;android-28"};
-
//////////////////////////////////////////////////////////////////////
// TASKS
//////////////////////////////////////////////////////////////////////
@@ -85,9 +111,12 @@ Task("provision-macsdk")
.Description("Install Xamarin.Mac SDK")
.Does(async () =>
{
- if(!IsRunningOnWindows() && !String.IsNullOrWhiteSpace(macSDK))
+ if(!IsRunningOnWindows())
{
- await Boots(macSDK);
+ if(!String.IsNullOrWhiteSpace(macSDK))
+ await Boots(macSDK);
+ else
+ await Boots (Product.XamarinMac, releaseChannel);
}
});
@@ -95,8 +124,12 @@ Task("provision-iossdk")
.Description("Install Xamarin.iOS SDK")
.Does(async () =>
{
- if(!String.IsNullOrWhiteSpace(iosSDK))
- await Boots(iosSDK);
+ if (!IsRunningOnWindows ()) {
+ if(!String.IsNullOrWhiteSpace(iosSDK))
+ await Boots(iosSDK);
+ else
+ await Boots (Product.XamariniOS, releaseChannel);
+ }
});
Task("provision-androidsdk")
@@ -112,49 +145,30 @@ Task("provision-androidsdk")
SkipVersionCheck = true
};
-
AcceptLicenses (androidSdkSettings);
-
AndroidSdkManagerUpdateAll (androidSdkSettings);
-
AcceptLicenses (androidSdkSettings);
-
AndroidSdkManagerInstall (androidSdkManagerInstalls, androidSdkSettings);
}
- if(!String.IsNullOrWhiteSpace(androidSDK))
- await Boots (androidSDK);
+
+ if (!IsRunningOnWindows ()) {
+ if(!String.IsNullOrWhiteSpace(androidSDK))
+ await Boots (androidSDK);
+ else
+ await Boots (Product.XamarinAndroid, releaseChannel);
+ }
});
Task("provision-monosdk")
.Description("Install Mono SDK")
.Does(async () =>
{
- if(IsRunningOnWindows())
- {
- if(!String.IsNullOrWhiteSpace(monoSDK))
- {
- string monoPath = $"{System.IO.Path.GetTempPath()}mono.msi";
-
- if(!String.IsNullOrWhiteSpace(EnvironmentVariable("Build.Repository.LocalPath")))
- monoPath = EnvironmentVariable("Build.Repository.LocalPath") + "\\" + "mono.msi";
-
- Information("Mono Path: {0}", monoPath);
- Information("Mono Version: {0}", monoSDK);
- DownloadFile(monoSDK, monoPath);
-
- StartProcess("msiexec", new ProcessSettings {
- Arguments = new ProcessArgumentBuilder()
- .Append(@"/i")
- .Append(monoPath)
- .Append("/qn")
- }
- );
- }
- }
- else
+ if(!IsRunningOnWindows())
{
if(!String.IsNullOrWhiteSpace(monoSDK))
await Boots(monoSDK);
+ else
+ await Boots (Product.Mono, releaseChannel);
}
});
@@ -167,7 +181,8 @@ Task("provision")
Task("NuGetPack")
.Description("Build and Create Nugets")
- .IsDependentOn("Build")
+ .IsDependentOn("Restore")
+ .IsDependentOn("BuildForNuget")
.IsDependentOn("_NuGetPack");
@@ -220,18 +235,55 @@ Task("Restore")
}
});
-Task("Build")
+Task("BuildForNuget")
.Description("Builds all necessary projects to create Nuget Packages")
+ .Does(() =>
+{
+ try{
+
+ var msbuildSettings = GetMSBuildSettings();
+ var binaryLogger = new MSBuildBinaryLogSettings {
+ Enabled = true
+ };
+
+ msbuildSettings.BinaryLogger = binaryLogger;
+ msbuildSettings.ArgumentCustomization = args => args.Append("/nowarn:VSX1000");
+ binaryLogger.FileName = $"{artifactStagingDirectory}/win-{configuration}.binlog";
+
+ MSBuild("./Xamarin.Forms.sln", msbuildSettings);
+
+ binaryLogger.FileName = $"{artifactStagingDirectory}/win-{configuration}-csproj.binlog";
+ MSBuild("./Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj",
+ msbuildSettings
+ .WithTarget("rebuild")
+ .WithProperty("DisableEmbeddedXbf", "false"));
+
+ binaryLogger.FileName = $"{artifactStagingDirectory}/ios-{configuration}-csproj.binlog";
+ MSBuild("./Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj",
+ msbuildSettings
+ .WithTarget("rebuild")
+ .WithProperty("USE2017", "true"));
+
+ 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)
+ {
+ if(IsRunningOnWindows())
+ throw;
+ }
+});
+
+Task("Build")
+ .Description("Builds all necessary projects to run Control Gallery")
.IsDependentOn("Restore")
.Does(() =>
{
try{
MSBuild("./Xamarin.Forms.sln", GetMSBuildSettings().WithRestore());
-
- MSBuild("./Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj",
- GetMSBuildSettings()
- .WithRestore()
- .WithProperty("DisableEmbeddedXbf", "false"));
}
catch(Exception)
{
diff --git a/build/steps/build-osx.yml b/build/steps/build-osx.yml
index 8f399b394..939373473 100644
--- a/build/steps/build-osx.yml
+++ b/build/steps/build-osx.yml
@@ -15,7 +15,7 @@ steps:
inputs:
targetType: 'filePath'
filePath: 'build.sh'
- arguments: --target provision
+ arguments: --target provision --buildForVS2017=$(buildForVS2017)
- task: UseDotNet@2
displayName: 'Install .net core $(DOTNET_VERSION)'
@@ -56,11 +56,12 @@ steps:
inputs:
solutionFile: $(slnPath)
configuration: $(buildConfiguration)
- args: /bl:$(Build.ArtifactStagingDirectory)/ios.binlog
+ args: /bl:$(Build.ArtifactStagingDirectory)/ios-2017_$(buildForVS2017).binlog
- task: CopyFiles@2
displayName: 'Copy test-cloud.exe'
+ condition: eq(variables['buildForVS2017'], 'false')
inputs:
Contents: '**/Xamarin.UITest.*/tools/test-cloud.exe'
TargetFolder: '$(build.artifactstagingdirectory)/testcloud'
@@ -71,6 +72,7 @@ steps:
- task: CopyFiles@2
displayName: 'Copy iOS Files for UITest'
+ condition: eq(variables['buildForVS2017'], 'false')
inputs:
Contents: |
**/$(IpaName)
@@ -87,6 +89,7 @@ steps:
- task: CopyFiles@2
displayName: 'Copy Android Files for UITest'
+ condition: eq(variables['buildForVS2017'], 'false')
inputs:
Contents: |
Xamarin.Forms.Core.Android.UITests/bin/$(BuildConfiguration)/Newtonsoft.Json.*
diff --git a/build/steps/build-windows.yml b/build/steps/build-windows.yml
index 461df18a1..d9abcf13b 100644
--- a/build/steps/build-windows.yml
+++ b/build/steps/build-windows.yml
@@ -9,9 +9,6 @@ parameters:
postBuildSteps: [] # any additional steps to run after the build
slnPath : 'Xamarin.Forms.sln'
csprojPath : 'Xamarin.Forms.Platform.UAP\Xamarin.Forms.Platform.UAP.csproj'
- buildConfiguration : 'Debug'
- releaseBuildConfiguration : 'Release'
- buildPlatform : 'any cpu'
msbuildExtraArguments : ''
artifactsTargetFolder: '$(build.artifactstagingdirectory)'
artifactsName: 'win_build'
@@ -33,15 +30,13 @@ jobs:
strategy:
matrix:
debug:
- BuildConfiguration: ${{ parameters.buildConfiguration }}
- BuildPlatform: ${{ parameters.buildPlatform }}
+ BuildConfiguration: 'Debug'
release:
- BuildConfiguration: ${{ parameters.releaseBuildConfiguration }}
- BuildPlatform: ${{ parameters.buildPlatform }}
+ BuildConfiguration: 'Release'
steps:
- checkout: self
clean: true
- - script: build.cmd -Target provision --verbosity=diagnostic
+ - script: build.cmd -Target provision
displayName: 'Cake Provision'
condition: eq(variables['provisioningCake'], 'true')
@@ -70,23 +65,9 @@ jobs:
inputs:
restoreSolution: ${{ parameters.slnPath }}
- - task: MSBuild@1
- displayName: 'Build solution ${{ parameters.slnPath }}'
+ - script: build.cmd -Target BuildForNuget -ScriptArgs '-configuration="$(BuildConfiguration)"','-Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"'
name: winbuild
- inputs:
- solution: ${{ parameters.slnPath }}
- platform: '$(BuildPlatform)'
- configuration: '$(BuildConfiguration)'
- msbuildArguments: ${{ parameters.msbuildExtraArguments }} /bl:$(Build.ArtifactStagingDirectory)\win-$(BuildConfiguration).binlog
-
- - task: MSBuild@1
- displayName: 'Embed XBF into PRI'
- condition: eq(${{ parameters.includeUwp }}, 'true')
- name: winbuild_pri_embed
- inputs:
- solution: ${{ parameters.csprojPath }}
- configuration: '$(BuildConfiguration)'
- msbuildArguments: ${{ parameters.msbuildExtraArguments }} /t:rebuild /p:DisableEmbeddedXbf=false /bl:$(Build.ArtifactStagingDirectory)\win-$(BuildConfiguration)-csproj.binlog
+ displayName: 'Build Projects For Nuget'
- task: VSTest@2
displayName: 'Unit Tests'