Bump Microsoft.Extensions.Http.Polly from 7.0.2 to 7.0.3 in /samples (#…

…185) * Bump Microsoft.Extensions.Http.Polly from 7.0.2 to 7.0.3 in /samples Bumps [Microsoft.Extensions.Http.Polly](https://github.com/dotnet/aspnetcore) from 7.0.2 to 7.0.3. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/commits) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Http.Polly dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update TypedBindingExtensionsTests.cs * Update global.json * Update CommunityToolkit.Maui.Markup.SourceGenerators.csproj * Revert "Update CommunityToolkit.Maui.Markup.SourceGenerators.csproj" This reverts commit ceca25c. * Update azure-pipelines.yml * Update azure-pipelines.yml --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
CommunityToolkit · Feb 26, 2023 · 70958bb · 70958bb
1 parent d7a0877
commit 70958bb
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 186 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -42,29 +42,17 @@ schedules:
     - main
 
 jobs:      
-  - job: build_windows
-    displayName: Build Windows Library
+  - job: build_sample
+    displayName: Build Library
+    strategy:
+      matrix:
+        'Windows':
+          image: 'windows-latest'
+        'macOS':
+          image: 'macos-12'
     pool:
-      vmImage: windows-latest
+      vmImage: $(image)
     steps:
-      - task: UseDotNet@2
-        displayName: 'Install .NET SDK'
-        inputs:
-          packageType: 'sdk'
-          version: '$(NET_VERSION)'
-
-      - task: CmdLine@2
-        displayName: 'Install .NET MAUI Workload'
-        inputs:
-            script : |
-              dotnet --info
-              dotnet workload install maui
-
-      - pwsh: |
-          Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1'
-          .\workload-install.ps1
-        displayName: Install Tizen Workload
-
       # if this is a tagged build, then update the version number
       - powershell: |
           $buildSourceBranch = "$(Build.SourceBranch)"
@@ -83,67 +71,80 @@ jobs:
           Write-Host ("##vso[task.setvariable variable=NugetPackageVersion;]$fullVersionString")
           Write-Host "##vso[build.updatebuildnumber]$fullVersionString"
         displayName: Set NuGet Version to PR Version
-        condition: and(succeeded(), eq(variables['build.reason'], 'PullRequest'))
+        condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['build.reason'], 'PullRequest'))
+
+      - task: CmdLine@2
+        displayName: 'Set Xcode v$(XcodeVersion)'
+        condition: eq(variables['Agent.OS'], 'Darwin') # Only run this step on macOS
+        inputs:
+          script: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XcodeVersion).app;sudo xcode-select --switch /Applications/Xcode_$(XcodeVersion).app/Contents/Developer
+
+      - task: UseDotNet@2
+        displayName: 'Install .NET SDK'
+        inputs:
+          packageType: 'sdk'
+          version: '$(NET_VERSION)'
+
+      - task: CmdLine@2
+        displayName: 'Install .NET MAUI Workload'
+        inputs:
+            script : |
+              dotnet --info
+              dotnet workload install maui
+
+      - pwsh: |
+          Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1'
+          .\workload-install.ps1
+        displayName: Install Tizen Workload
 
       # build
-      - task: VSBuild@1
+      - task: CmdLine@2
         displayName: 'Build CommunityToolkit.Maui.Markup.SourceGenerators'
         inputs:
-          solution: '$(PathToCommunityToolkitSourceGeneratorsCsproj)'
-          configuration: 'Release'
-          msbuildArgs: '/restore /warnaserror'
+          script: 'dotnet build -c Release $(PathToCommunityToolkitSourceGeneratorsCsproj) -warnaserror'
 
-      - task: VSBuild@1
+      - task: CmdLine@2
         displayName: 'Build CommunityToolkit.Maui.Markup'
         inputs:
-          solution: '$(PathToCommunityToolkitCsproj)'
-          configuration: 'Release'
-          msbuildArgs: '/restore /warnaserror'
+          script: 'dotnet build -c Release $(PathToCommunityToolkitCsproj) -warnaserror'
 
-      - task: VSBuild@1
+      - task: CmdLine@2
         displayName: 'Build CommunityToolkit.Maui.Markup.Sample'
         inputs:
-          solution: '$(PathToCommunityToolkitSampleCsproj)'
-          configuration: 'Release'
-          msbuildArgs: '/restore /warnaserror'
+          script: 'dotnet build -c Release $(PathToCommunityToolkitSampleCsproj) -warnaserror'
 
-      - task: VSBuild@1
+      - task: CmdLine@2
         displayName: 'Build CommunityToolkit.Maui.Markup.UnitTests'
         inputs:
-          solution: '$(PathToCommunityToolkitUnitTestCsproj)'
-          configuration: 'Release'
-          msbuildArgs: '/restore /warnaserror'
+          script: 'dotnet build -c Release $(PathToCommunityToolkitUnitTestCsproj) -warnaserror'
 
       # test
-      - task: DotNetCoreCLI@2
+      - task: CmdLine@2
         displayName: 'Run Unit Tests'
         inputs:
-          command: 'test'
-          projects: '$(PathToCommunityToolkitUnitTestCsproj)'
-          arguments: '--configuration Release --settings ".runsettings" --collect "XPlat code coverage" --logger trx --results-directory $(Agent.TempDirectory)'
-          publishTestResults: false  
+          script: 'dotnet test -c Release $(PathToCommunityToolkitUnitTestCsproj) --settings ".runsettings" --collect "XPlat code coverage" --logger trx --results-directory $(Agent.TempDirectory)'
 
       - task: PublishTestResults@2
+        condition: eq(variables['Agent.OS'], 'Windows_NT') # Only run this step on Windows
         displayName: 'Publish Test Results'
         inputs:
           testResultsFormat: VSTest
           testResultsFiles: '**/*.trx'
           searchFolder: $(Agent.TempDirectory)
 
       - task: PublishCodeCoverageResults@1
+        condition: eq(variables['Agent.OS'], 'Windows_NT') # Only run this step on Windows
         displayName: 'Publish Code Coverage Results'
         inputs:
           codeCoverageTool: 'Cobertura'
           summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml'
-          failIfCoverageEmpty: true 
+          failIfCoverageEmpty: true
 
       # pack
-      - task: VSBuild@1
+      - task: CmdLine@2
         displayName: 'Build and Pack CommunityToolkit.Maui.Markup'
         inputs:
-          solution: '$(PathToCommunityToolkitCsproj)'
-          configuration: 'Release'
-          msbuildArgs: '/restore -t:pack -p:PackageVersion=$(NugetPackageVersion) -p:Version=$(NugetPackageVersion) -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg'
+          script: 'dotnet pack -c Release $(PathToCommunityToolkitCsproj) -p:PackageVersion=$(NugetPackageVersion) -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg'
 
       # check vulnerabilities
       - powershell: |
@@ -156,8 +157,9 @@ jobs:
 
           exit 0;
         displayName: 'Check Dependencies'
-        condition: eq(variables.ShouldCheckDependencies, true)
-      # publish
+        condition: eq(variables['Agent.OS'], 'Windows_NT') # Only run this step on Windows
+
+      # Copy all NuGet packages
       - task: PowerShell@2
         displayName: 'Copy NuGet Packages to Staging Directory'
         inputs:
@@ -177,143 +179,11 @@ jobs:
           SignClientUser: $(SignClientUser)
           SignClientSecret: $(SignClientSecret)
           ArtifactDirectory: $(Build.ArtifactStagingDirectory)
-        condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
+        condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
 
       # publish the packages
       - task: PublishBuildArtifacts@1
         displayName: 'Publish Unsigned NuGets'
         inputs:
           artifactName: nuget
-          pathToPublish: '$(Build.ArtifactStagingDirectory)'
-
-  - job: verify_formatting_windows
-    displayName: Verify Code Formatting on Windows
-    pool:
-      vmImage: windows-latest
-    steps:
-      - task: UseDotNet@2
-        displayName: 'Install Latest .NET SDK'
-        inputs:
-          packageType: 'sdk'
-          version: '$(NET_VERSION)'
-
-      - powershell: dotnet workload install maui
-        displayName: Install Latest .NET MAUI Workload
-
-      - pwsh: |
-          Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1'
-          .\workload-install.ps1
-        displayName: Install Tizen Workload
-
-      - task: Bash@3
-        displayName: 'Verify Formatting'
-        env:
-          PathToSamplesSolution: $(PathToSamplesSolution)
-        inputs:
-          targetType: 'inline'
-          script: |
-            dotnet format $PathToSamplesSolution -v diag --verify-no-changes --exclude-diagnostics CA1416
-            status=$?
-            [ $status -eq 0 ] && echo "No errors found"
-            [ $status -ne 0 ] && echo "Formatting errors found. In the Windows Command Line, please run \`dotnet format $PathToSamplesSolution\`, then commit + push the newly formatted code"
-            exit $status
-
-  - job: verify_formatting_macos
-    displayName: Verify Code Formatting on macOS
-    pool:
-      vmImage: macos-12
-    steps:
-      - task: CmdLine@2
-        displayName: 'Set Xcode Version'
-        inputs:
-          script: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XcodeVersion).app;sudo xcode-select --switch /Applications/Xcode_$(XcodeVersion).app/Contents/Developer
-
-      - task: UseDotNet@2
-        displayName: 'Install Latest .NET SDK'
-        inputs:
-          packageType: 'sdk'
-          version: '$(NET_VERSION)'
-
-      - powershell: dotnet workload install maui
-        displayName: Install Latest .NET MAUI Workload
-
-      - task: Bash@3
-        displayName: 'Verify Formatting'
-        env:
-          PathToSamplesSolution: $(PathToSamplesSolution)
-        inputs:
-          targetType: 'inline'
-          script: |
-            dotnet format $PathToSamplesSolution -v diag --verify-no-changes --exclude-diagnostics CA1416
-            status=$?
-            [ $status -eq 0 ] && echo "No errors found"
-            [ $status -ne 0 ] && echo "Formatting errors found. In the macOS Terminal, please run \`dotnet format $PathToSamplesSolution\`, then commit + push the newly formatted code"
-            exit $status
-
-  - job: build_macos
-    displayName: Build macOS Library
-    pool:
-      vmImage: macos-12
-    steps:
-      # if this is a tagged build, then update the version number
-      - powershell: |
-          $buildSourceBranch = "$(Build.SourceBranch)"
-          $tagVersion = $buildSourceBranch.Substring($buildSourceBranch.LastIndexOf("/") + 1)
-          Write-Host("Branch = $buildSourceBranch, Version = $tagVersion");
-          Write-Host ("##vso[task.setvariable variable=NugetPackageVersion;]$tagVersion")
-        displayName: Set NuGet Version to Tag Number
-        condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
-        
-      - task: CmdLine@2
-        displayName: 'Set Xcode Version'
-        inputs:
-          script: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XcodeVersion).app;sudo xcode-select --switch /Applications/Xcode_$(XcodeVersion).app/Contents/Developer
-
-      - task: UseDotNet@2
-        displayName: 'Install .NET SDK'
-        inputs:
-          packageType: 'sdk'
-          version: '$(NET_VERSION)'
-
-      - task: CmdLine@2
-        displayName: 'Install .NET MAUI workload'
-        inputs:
-          script: 'dotnet workload install maui'
-
-      - task: CmdLine@2
-        displayName: 'Restore NuGet Packages'
-        inputs:
-          script: 'dotnet restore $(PathToCommunityToolkitCsproj)'
-
-      # build
-      - task: CmdLine@2
-        displayName: 'Build CommunityToolkit.Maui.Markup.SourceGenerators'
-        inputs:
-          script: dotnet build $(PathToCommunityToolkitSourceGeneratorsCsproj) -c Release -warnaserror
-
-      - task: CmdLine@2
-        displayName: 'Build CommunityToolkit.Maui.Markup'
-        inputs:
-          script: dotnet build $(PathToCommunityToolkitCsproj) -c Release -warnaserror
-
-      - task: CmdLine@2
-        displayName: 'Build CommunityToolkit.Maui.Markup.Sample'
-        inputs:
-          script: dotnet build $(PathToCommunityToolkitSampleCsproj) -c Release -warnaserror
-
-      - task: CmdLine@2
-        displayName: 'Build CommunityToolkit.Maui.Markup.UnitTests'
-        inputs:
-          script: dotnet build $(PathToCommunityToolkitSampleCsproj) -c Release -warnaserror
-
-      # test
-      - task: CmdLine@2
-        displayName: 'Run Unit Tests'
-        inputs:
-          script: dotnet test $(PathToCommunityToolkitUnitTestCsproj) -c Release
-
-      # pack
-      - task: CmdLine@2
-        displayName: 'Pack CommunityToolkit NuGets'
-        inputs:
-          script: 'dotnet pack -c Release $(PathToCommunityToolkitCsproj) -p:PackageVersion=$(NugetPackageVersion) --output $(Build.ArtifactStagingDirectory)/nuget -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg'
+          pathToPublish: '$(Build.ArtifactStagingDirectory)'
diff --git a/global.json b/global.json
@@ -1,6 +1,7 @@
 {
   "sdk": {
     "version": "7.0.100",
-    "rollForward": "latestMajor"
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
   }
 }
diff --git a/samples/CommunityToolkit.Maui.Markup.Sample/CommunityToolkit.Maui.Markup.Sample.csproj b/samples/CommunityToolkit.Maui.Markup.Sample/CommunityToolkit.Maui.Markup.Sample.csproj
@@ -44,7 +44,7 @@
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Maui" Version="4.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.3" />
     <PackageReference Include="Refit.HttpClientFactory" Version="6.3.2" />
   </ItemGroup>