Merge branch 'main' into chore/kiota-bundle

microsoftgraph · Dec 16, 2024 · 7c8c554 · 7c8c554
2 parents e40fb97 + 7afe7f9
commit 7c8c554
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "3.2.0"
+  ".": "3.2.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project does adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.2.1](https://github.com/microsoftgraph/msgraph-sdk-dotnet-core/compare/3.2.0...3.2.1) (2024-11-18)
+
+
+### Bug Fixes
+
+* removes upper bound on System.Net.Http.WinHttpHandler ([72aa793](https://github.com/microsoftgraph/msgraph-sdk-dotnet-core/commit/72aa793b90964335c051d7ba1c06d2f9f6aa5524))
+* removes upper bound on System.Net.Http.WinHttpHandler ([4f50933](https://github.com/microsoftgraph/msgraph-sdk-dotnet-core/commit/4f509338ed4440ae3f3e4cc6fe7069ce7bd3ee37))
+
 ## [3.2.0](https://github.com/microsoftgraph/msgraph-sdk-dotnet-core/compare/3.1.22...3.2.0) (2024-11-08)
 
 

diff --git a/pipelines/productionBuild.yml b/pipelines/productionBuild.yml
@@ -78,7 +78,7 @@ extends:
             pwsh: true
           enabled: true
         - powershell: |
-            dotnet workload install android macos ios maccatalyst 
+            dotnet workload install android macos ios maccatalyst
           displayName: 'Install needed dotnet workloads'
         - task: DotNetCoreCLI@2
           displayName: 'dotnet restore'
@@ -243,6 +243,13 @@ extends:
       dependsOn: build
       jobs:
         - deployment: deploy_nuget
+          templateContext:
+            type: releaseJob
+            isProduction: true
+            inputs:
+            - input: pipelineArtifact
+              artifactName: ProductionReleaseArtifact
+              targetPath: $(Pipeline.Workspace)
           pool:
             name: Azure-Pipelines-1ESPT-ExDShared
             os: windows
@@ -258,11 +265,6 @@ extends:
                   inputs:
                     versionSpec: '>=5.2.0'
                     checkLatest: true
-                - task: DownloadPipelineArtifact@2
-                  displayName: Download nupkg from artifacts
-                  inputs:
-                    artifact: ProductionReleaseArtifact
-                    source: current
                 - task: PowerShell@2
                   displayName: 'Get Latest Commit SHA from repo'
                   inputs:
@@ -297,4 +299,4 @@ extends:
                     assetUploadMode: replace
                     assets: |
                       !**/**
-                      $(Pipeline.Workspace)/Microsoft.Graph.Core.*.*nupkg
+                      $(Pipeline.Workspace)/Microsoft.Graph.Core.*.*nupkg
diff --git a/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj b/src/Microsoft.Graph.Core/Microsoft.Graph.Core.csproj
@@ -21,7 +21,7 @@
     <AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <!-- x-release-please-start-version -->
-    <VersionPrefix>3.2.0</VersionPrefix>
+    <VersionPrefix>3.2.1</VersionPrefix>
     <!-- x-release-please-end -->
     <!-- VersionPrefix minor version should not be set when the change comes from the generator. It will be updated automatically. -->
     <!-- VersionPrefix minor version must be manually set when making manual changes to code. -->

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Microsoft.Graph.DotnetCore.Core.Test.csproj b/tests/Microsoft.Graph.DotnetCore.Core.Test/Microsoft.Graph.DotnetCore.Core.Test.csproj
@@ -22,7 +22,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">