From 8e624c4937afdd74b9d057707762cb20f2242d59 Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Wed, 29 Jul 2020 17:04:14 -0700 Subject: [PATCH 01/12] Update azure-pipelines.yml Attempt to build our own AppCenter script --- azure-pipelines.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9f3e2f110..467e2b989 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -132,3 +132,13 @@ steps: echo windows script testing this var $PF_TEST_TITLE_DATA_JSON cmd <<< UnitTestRunner.exe -testInputsFile '$PF_TEST_TITLE_DATA_JSON' displayName: 'dotNet 45 CSharpSDK UnitTestRunner' + +- bash: | + echo === Build and Test Xamarin for Android === + SHORT_WORKSPACE="c:\\${JOB_NAME}_${EXECUTOR_NUMBER}" + SDKBUILDSCRIPTS="c:\\${JOB_NAME}_${EXECUTOR_NUMBER}_BS" + PROJECTPATH="c:\\${JOB_NAME}_${EXECUTOR_NUMBER}_PP" + XTA="$SDKBUILDSCRIPTS/AppCenterUITestLauncher/AppCenterUITestLauncher/debugassemblies" + cd "JenkinsSdkSetupScripts/JenkinsSdkSetupScripts/JenkinsScripts/Pipeline" + . ./xamarin_buildAppCenterTestAndroid.sh "$XTA" "$PROJECTPATH" + displayName: 'AppCenter Script' From c80a8759e6c8ec75b289d73265f1da2c098da85d Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Wed, 29 Jul 2020 22:18:19 -0700 Subject: [PATCH 02/12] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 467e2b989..3f5e7ecd4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -140,5 +140,6 @@ steps: PROJECTPATH="c:\\${JOB_NAME}_${EXECUTOR_NUMBER}_PP" XTA="$SDKBUILDSCRIPTS/AppCenterUITestLauncher/AppCenterUITestLauncher/debugassemblies" cd "JenkinsSdkSetupScripts/JenkinsSdkSetupScripts/JenkinsScripts/Pipeline" + echo === TESTING PF_TEST_TITLE_DATA: $PF_TEST_TITLE_DATA_JSON . ./xamarin_buildAppCenterTestAndroid.sh "$XTA" "$PROJECTPATH" - displayName: 'AppCenter Script' + displayName: 'AppCenter Script' From 0b875cfaac9b7e59c051fd5a1e8b6ac163ea8b61 Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Wed, 29 Jul 2020 23:28:45 -0700 Subject: [PATCH 03/12] Update azure-pipelines.yml for Azure Pipelines attempt to point to other places --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3f5e7ecd4..1f3511077 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -135,9 +135,9 @@ steps: - bash: | echo === Build and Test Xamarin for Android === - SHORT_WORKSPACE="c:\\${JOB_NAME}_${EXECUTOR_NUMBER}" - SDKBUILDSCRIPTS="c:\\${JOB_NAME}_${EXECUTOR_NUMBER}_BS" - PROJECTPATH="c:\\${JOB_NAME}_${EXECUTOR_NUMBER}_PP" + SHORT_WORKSPACE="$PWD" + SDKBUILDSCRIPTS="SDKGenerator/SDKBuildScripts/" + PROJECTPATH="sdks/CSharp/XamarinTestRunner/" XTA="$SDKBUILDSCRIPTS/AppCenterUITestLauncher/AppCenterUITestLauncher/debugassemblies" cd "JenkinsSdkSetupScripts/JenkinsSdkSetupScripts/JenkinsScripts/Pipeline" echo === TESTING PF_TEST_TITLE_DATA: $PF_TEST_TITLE_DATA_JSON From f2e5e40b746cff72423881621a9fd2c5d69dcbbd Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Thu, 30 Jul 2020 08:27:10 -0700 Subject: [PATCH 04/12] Update azure-pipelines.yml for Azure Pipelines Esnuring WORKSPACE is defined before calling xamarin script --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1f3511077..4780473b6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -135,6 +135,7 @@ steps: - bash: | echo === Build and Test Xamarin for Android === + WORKSPACE="$PWD/JenkinsSdkSetupScripts" SHORT_WORKSPACE="$PWD" SDKBUILDSCRIPTS="SDKGenerator/SDKBuildScripts/" PROJECTPATH="sdks/CSharp/XamarinTestRunner/" @@ -143,3 +144,4 @@ steps: echo === TESTING PF_TEST_TITLE_DATA: $PF_TEST_TITLE_DATA_JSON . ./xamarin_buildAppCenterTestAndroid.sh "$XTA" "$PROJECTPATH" displayName: 'AppCenter Script' + From 8b905e92f82cbf2e216f63d6ee9e50844ebf458a Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Thu, 30 Jul 2020 09:24:53 -0700 Subject: [PATCH 05/12] Update azure-pipelines.yml for Azure Pipelines updating path --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4780473b6..38e76e6dd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -138,10 +138,9 @@ steps: WORKSPACE="$PWD/JenkinsSdkSetupScripts" SHORT_WORKSPACE="$PWD" SDKBUILDSCRIPTS="SDKGenerator/SDKBuildScripts/" - PROJECTPATH="sdks/CSharp/XamarinTestRunner/" + PROJECTPATH="sdks/CSharp/" XTA="$SDKBUILDSCRIPTS/AppCenterUITestLauncher/AppCenterUITestLauncher/debugassemblies" cd "JenkinsSdkSetupScripts/JenkinsSdkSetupScripts/JenkinsScripts/Pipeline" echo === TESTING PF_TEST_TITLE_DATA: $PF_TEST_TITLE_DATA_JSON . ./xamarin_buildAppCenterTestAndroid.sh "$XTA" "$PROJECTPATH" displayName: 'AppCenter Script' - From bb0cece4021bf7abb22bbef9c3ba3b37532bc713 Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Thu, 30 Jul 2020 09:32:19 -0700 Subject: [PATCH 06/12] Update azure-pipelines.yml for Azure Pipelines updating path --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 38e76e6dd..174fcf08c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -138,7 +138,7 @@ steps: WORKSPACE="$PWD/JenkinsSdkSetupScripts" SHORT_WORKSPACE="$PWD" SDKBUILDSCRIPTS="SDKGenerator/SDKBuildScripts/" - PROJECTPATH="sdks/CSharp/" + PROJECTPATH="sdks/CSharp" XTA="$SDKBUILDSCRIPTS/AppCenterUITestLauncher/AppCenterUITestLauncher/debugassemblies" cd "JenkinsSdkSetupScripts/JenkinsSdkSetupScripts/JenkinsScripts/Pipeline" echo === TESTING PF_TEST_TITLE_DATA: $PF_TEST_TITLE_DATA_JSON From e055ff88265e81a02f0b8e93574a812ae02c5606 Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Thu, 30 Jul 2020 09:38:18 -0700 Subject: [PATCH 07/12] Update azure-pipelines.yml for Azure Pipelines updating path, wrong CSharp directory --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 174fcf08c..b24242bb9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -138,7 +138,7 @@ steps: WORKSPACE="$PWD/JenkinsSdkSetupScripts" SHORT_WORKSPACE="$PWD" SDKBUILDSCRIPTS="SDKGenerator/SDKBuildScripts/" - PROJECTPATH="sdks/CSharp" + PROJECTPATH="sdks/CSharpSDK" XTA="$SDKBUILDSCRIPTS/AppCenterUITestLauncher/AppCenterUITestLauncher/debugassemblies" cd "JenkinsSdkSetupScripts/JenkinsSdkSetupScripts/JenkinsScripts/Pipeline" echo === TESTING PF_TEST_TITLE_DATA: $PF_TEST_TITLE_DATA_JSON From ee2ac65ab439932fcd64d6a18d38a32e7c26b0b2 Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Thu, 30 Jul 2020 09:58:21 -0700 Subject: [PATCH 08/12] Update azure-pipelines.yml for Azure Pipelines hacking a file that apparently doesn't exist in the correct location --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b24242bb9..0b49fe911 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -135,6 +135,9 @@ steps: - bash: | echo === Build and Test Xamarin for Android === + echo == hack for xamarin script == + cp $PF_TEST_TITLE_DATA_JSON "sdks/CSharpSDK/XamarinTestRunner/XamarinTestRunner/testTitleData.json" + echo == end hack for xamarin script == WORKSPACE="$PWD/JenkinsSdkSetupScripts" SHORT_WORKSPACE="$PWD" SDKBUILDSCRIPTS="SDKGenerator/SDKBuildScripts/" From 480b1d03a2e8bc276dfeb1208c6270040daa8a9b Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Mon, 10 Aug 2020 11:39:59 -0700 Subject: [PATCH 09/12] Update azure-pipelines.yml --- azure-pipelines.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0b49fe911..b9fdcdeac 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -131,19 +131,5 @@ steps: echo START .Net4.5 UNIT TEST RUNNER echo windows script testing this var $PF_TEST_TITLE_DATA_JSON cmd <<< UnitTestRunner.exe -testInputsFile '$PF_TEST_TITLE_DATA_JSON' + echo lol this should be done now displayName: 'dotNet 45 CSharpSDK UnitTestRunner' - -- bash: | - echo === Build and Test Xamarin for Android === - echo == hack for xamarin script == - cp $PF_TEST_TITLE_DATA_JSON "sdks/CSharpSDK/XamarinTestRunner/XamarinTestRunner/testTitleData.json" - echo == end hack for xamarin script == - WORKSPACE="$PWD/JenkinsSdkSetupScripts" - SHORT_WORKSPACE="$PWD" - SDKBUILDSCRIPTS="SDKGenerator/SDKBuildScripts/" - PROJECTPATH="sdks/CSharpSDK" - XTA="$SDKBUILDSCRIPTS/AppCenterUITestLauncher/AppCenterUITestLauncher/debugassemblies" - cd "JenkinsSdkSetupScripts/JenkinsSdkSetupScripts/JenkinsScripts/Pipeline" - echo === TESTING PF_TEST_TITLE_DATA: $PF_TEST_TITLE_DATA_JSON - . ./xamarin_buildAppCenterTestAndroid.sh "$XTA" "$PROJECTPATH" - displayName: 'AppCenter Script' From 365a15da5d8efb97c063273d32ab9fad5d3763a6 Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Mon, 10 Aug 2020 11:47:56 -0700 Subject: [PATCH 10/12] Fixing directory check --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b9fdcdeac..a703145b6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -37,13 +37,13 @@ steps: inputs: targetType: inline script: | - New-Item -Path . -Name "JenkinsSdkSetupScripts" -ItemType "directory" - New-Item -Path . -Name "sdks" -ItemType "directory" - New-Item -Path . -Name "SDKGenerator" -ItemType "directory" - New-Item -Path . -Name "API_Specs" -ItemType "directory" + New-Item -Path . -Name "JenkinsSdkSetupScripts" -ItemType "directory" # Equals "self" + New-Item -Path . -Name "sdks" -ItemType "directory" # Equals "self" + New-Item -Path . -Name "SDKGenerator" -ItemType "directory" # Equals "self" + New-Item -Path . -Name "API_Specs" -ItemType "directory" # Equals "self" ls cd sdks - New-Item -Path . -Name "CSharpSDK" -ItemType "directory" + New-Item -Path . -Name "CSharpSDK" -ItemType "directory" # Equals "self" pwsh: true - checkout: self From 6e085100853f208c1b0aba2f61e91518a9c397e9 Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Mon, 10 Aug 2020 11:50:29 -0700 Subject: [PATCH 11/12] remove workaround if the directories are already there --- azure-pipelines.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a703145b6..90fc65659 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,19 +32,19 @@ pool: steps: -- task: PowerShell@2 - displayName: "Create folders for repos (workaround)" - inputs: - targetType: inline - script: | - New-Item -Path . -Name "JenkinsSdkSetupScripts" -ItemType "directory" # Equals "self" - New-Item -Path . -Name "sdks" -ItemType "directory" # Equals "self" - New-Item -Path . -Name "SDKGenerator" -ItemType "directory" # Equals "self" - New-Item -Path . -Name "API_Specs" -ItemType "directory" # Equals "self" - ls - cd sdks - New-Item -Path . -Name "CSharpSDK" -ItemType "directory" # Equals "self" - pwsh: true +#- task: PowerShell@2 +# displayName: "Create folders for repos (workaround)" +# inputs: +# targetType: inline +# script: | +# New-Item -Path . -Name "JenkinsSdkSetupScripts" -ItemType "directory" # Equals "self" +# New-Item -Path . -Name "sdks" -ItemType "directory" # Equals "self" +# New-Item -Path . -Name "SDKGenerator" -ItemType "directory" # Equals "self" +# New-Item -Path . -Name "API_Specs" -ItemType "directory" # Equals "self" +# ls +# cd sdks +# New-Item -Path . -Name "CSharpSDK" -ItemType "directory" # Equals "self" +# pwsh: true - checkout: self clean: true From 063a2b5205b3d5804883ae258c4a4cc8f53ad793 Mon Sep 17 00:00:00 2001 From: Todd Bello Date: Mon, 10 Aug 2020 11:59:18 -0700 Subject: [PATCH 12/12] Update azure-pipelines.yml --- azure-pipelines.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 90fc65659..a703145b6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,19 +32,19 @@ pool: steps: -#- task: PowerShell@2 -# displayName: "Create folders for repos (workaround)" -# inputs: -# targetType: inline -# script: | -# New-Item -Path . -Name "JenkinsSdkSetupScripts" -ItemType "directory" # Equals "self" -# New-Item -Path . -Name "sdks" -ItemType "directory" # Equals "self" -# New-Item -Path . -Name "SDKGenerator" -ItemType "directory" # Equals "self" -# New-Item -Path . -Name "API_Specs" -ItemType "directory" # Equals "self" -# ls -# cd sdks -# New-Item -Path . -Name "CSharpSDK" -ItemType "directory" # Equals "self" -# pwsh: true +- task: PowerShell@2 + displayName: "Create folders for repos (workaround)" + inputs: + targetType: inline + script: | + New-Item -Path . -Name "JenkinsSdkSetupScripts" -ItemType "directory" # Equals "self" + New-Item -Path . -Name "sdks" -ItemType "directory" # Equals "self" + New-Item -Path . -Name "SDKGenerator" -ItemType "directory" # Equals "self" + New-Item -Path . -Name "API_Specs" -ItemType "directory" # Equals "self" + ls + cd sdks + New-Item -Path . -Name "CSharpSDK" -ItemType "directory" # Equals "self" + pwsh: true - checkout: self clean: true