From b1d8f0a0ccd6f23d68d3820ad4539ee1cd043d95 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Sat, 3 Apr 2021 02:53:41 -0500 Subject: [PATCH 1/3] Add apple theme static libraries to NuGet, add NuGet Publish PR job --- .ado/azure-pipelines.yml | 42 ++++++++++++++++++++++++++++++++++++++++ package.nuspec | 6 ++++++ 2 files changed, 48 insertions(+) diff --git a/.ado/azure-pipelines.yml b/.ado/azure-pipelines.yml index 2d12f5929ab..5fee8060aa9 100644 --- a/.ado/azure-pipelines.yml +++ b/.ado/azure-pipelines.yml @@ -146,3 +146,45 @@ jobs: publishJUnitResults: false javaHomeOption: 'JDKVersion' sonarQubeRunAnalysis: false + + # Uncomment this job to test changes to changes to the NuGet package + # Commented out by default because this job is much longer than the other PR jobs + - job: NuGetPublish + displayName: NuGet Publish + pool: + vmImage: 'macos-10.15' + demands: ['xcode', 'sh', 'npm'] + timeoutInMinutes: 90 # how long to run the job before automatically cancelling + cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them + + steps: + - checkout: self + persistCredentials: true + + - template: templates/setup-repo-min-build.yml + + # Clean Derived Data + - script: | + rm -rf $(Build.Repository.LocalPath)/DerivedData + displayName: 'Clean DerivedData' + + - script: | + sudo gem install cocoapods + displayName: 'Install CocoaPods Environment' + + - script: | + yarn bundle ios + workingDirectory: $(Build.Repository.LocalPath)/apps/ios + displayName: 'yarn bundle iOS' + + - script: | + yarn bundle macos + workingDirectory: $(Build.Repository.LocalPath)/apps/macos + displayName: 'yarn bundle macOS' + + # Select proper Xcode version + - template: templates/apple-xcode-select.yml + + - template: templates/apple-xcode-build-static-libs.yml + + - template: templates/nuget-publish.yml diff --git a/package.nuspec b/package.nuspec index 4fd392c75f0..1ccce96a683 100644 --- a/package.nuspec +++ b/package.nuspec @@ -10,26 +10,32 @@ + + + + + + From 7347e3f348ed9bd9c865b631749a9c64caaa6244 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Sat, 3 Apr 2021 03:53:29 -0500 Subject: [PATCH 2/3] Fix path in nuspec --- package.nuspec | 84 +++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/package.nuspec b/package.nuspec index 1ccce96a683..196f1383538 100644 --- a/package.nuspec +++ b/package.nuspec @@ -1,48 +1,48 @@ - - Microsoft.FluentUI.ReactNative - $buildNumber$ - A react-native component library that implements the Fluent Design System. - Microsoft - https://github.com/microsoft/fluentui-react-native.git - - - - - - - - - - - - - - - - - - - - - - - + + Microsoft.FluentUI.ReactNative + $buildNumber$ + A react-native component library that implements the Fluent Design System. + Microsoft + https://github.com/microsoft/fluentui-react-native.git + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - + + + \ No newline at end of file From 2fb420b6404df39f0d0d13fd57d9de207965794e Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Sat, 3 Apr 2021 04:51:25 -0500 Subject: [PATCH 3/3] Comment out NugetPuclish PR Job --- .ado/azure-pipelines.yml | 72 +++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/.ado/azure-pipelines.yml b/.ado/azure-pipelines.yml index 5fee8060aa9..3c1dec86fcc 100644 --- a/.ado/azure-pipelines.yml +++ b/.ado/azure-pipelines.yml @@ -146,45 +146,35 @@ jobs: publishJUnitResults: false javaHomeOption: 'JDKVersion' sonarQubeRunAnalysis: false - # Uncomment this job to test changes to changes to the NuGet package - # Commented out by default because this job is much longer than the other PR jobs - - job: NuGetPublish - displayName: NuGet Publish - pool: - vmImage: 'macos-10.15' - demands: ['xcode', 'sh', 'npm'] - timeoutInMinutes: 90 # how long to run the job before automatically cancelling - cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them - - steps: - - checkout: self - persistCredentials: true - - - template: templates/setup-repo-min-build.yml - - # Clean Derived Data - - script: | - rm -rf $(Build.Repository.LocalPath)/DerivedData - displayName: 'Clean DerivedData' - - - script: | - sudo gem install cocoapods - displayName: 'Install CocoaPods Environment' - - - script: | - yarn bundle ios - workingDirectory: $(Build.Repository.LocalPath)/apps/ios - displayName: 'yarn bundle iOS' - - - script: | - yarn bundle macos - workingDirectory: $(Build.Repository.LocalPath)/apps/macos - displayName: 'yarn bundle macOS' - - # Select proper Xcode version - - template: templates/apple-xcode-select.yml - - - template: templates/apple-xcode-build-static-libs.yml - - - template: templates/nuget-publish.yml + # We keep it commented out by default because this job is much longer than the other PR jobs + # - job: NuGetPublish + # displayName: NuGet Publish + # pool: + # vmImage: 'macos-10.15' + # demands: ['xcode', 'sh', 'npm'] + # timeoutInMinutes: 90 # how long to run the job before automatically cancelling + # cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them + # steps: + # - checkout: self + # persistCredentials: true + # - template: templates/setup-repo-min-build.yml + # # Clean Derived Data + # - script: | + # rm -rf $(Build.Repository.LocalPath)/DerivedData + # displayName: 'Clean DerivedData' + # - script: | + # sudo gem install cocoapods + # displayName: 'Install CocoaPods Environment' + # - script: | + # yarn bundle ios + # workingDirectory: $(Build.Repository.LocalPath)/apps/ios + # displayName: 'yarn bundle iOS' + # - script: | + # yarn bundle macos + # workingDirectory: $(Build.Repository.LocalPath)/apps/macos + # displayName: 'yarn bundle macOS' + # # Select proper Xcode version + # - template: templates/apple-xcode-select.yml + # - template: templates/apple-xcode-build-static-libs.yml + # - template: templates/nuget-publish.yml