Merge remote-tracking branch 'origin/main' into andrueastman/pythonFix

microsoft · Nov 7, 2024 · 61826d0 · 61826d0
2 parents 3ad8594 + fb5ace9
commit 61826d0
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 58 deletions.
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -163,6 +163,9 @@ extends:
               - pwsh: $(Build.SourcesDirectory)/scripts/get-prerelease-version.ps1 -currentBranch $(Build.SourceBranch) -previewBranch ${{ parameters.previewBranch }} -excludeHeadingDash
                 displayName: "Set version suffix"
 
+              - pwsh: $(Build.SourcesDirectory)/scripts/enable-shims-for-packaging.ps1
+                displayName: "Add PackAsToolShimRuntimeIdentifiers attributes for tool packaging"
+
               - pwsh: $(Build.SourcesDirectory)/scripts/update-version-suffix-for-source-generator.ps1 -versionSuffix "$(versionSuffix)"
                 displayName: "Set version suffix in csproj for generators"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed a bug where the type name for inherited inline models would be incorrect. [#5610](https://github.com/microsoft/kiota/issues/5610)
 - Fixes typing inconsistencies in generated code and libraries in Python [kiota-python#333](https://github.com/microsoft/kiota-python/issues/333)
 - Fixes generation of superfluous fields for Models with discriminator due to refiners adding the same properties to the same model [#4178](https://github.com/microsoft/kiota/issues/4178).
+- Fixes unsigned shim binary when installed as dotnet tool [#5650](https://github.com/microsoft/kiota/issues/5650).
 - Fixed python generation in scenarios with opening/closing tags for code comments. [#5636](https://github.com/microsoft/kiota/issues/5636)
 
 ## [1.19.1] - 2024-10-11

diff --git a/it/typescript/package-lock.json b/it/typescript/package-lock.json
diff --git a/it/typescript/package.json b/it/typescript/package.json
@@ -32,13 +32,13 @@
   },
   "dependencies": {
     "@azure/identity": "^4.5.0",
-    "@microsoft/kiota-abstractions": "^1.0.0-preview.73",
-    "@microsoft/kiota-authentication-azure": "^1.0.0-preview.73",
-    "@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.73",
-    "@microsoft/kiota-serialization-form": "^1.0.0-preview.73",
-    "@microsoft/kiota-serialization-json": "^1.0.0-preview.73",
-    "@microsoft/kiota-serialization-multipart": "^1.0.0-preview.73",
-    "@microsoft/kiota-serialization-text": "^1.0.0-preview.73",
+    "@microsoft/kiota-abstractions": "^1.0.0-preview.74",
+    "@microsoft/kiota-authentication-azure": "^1.0.0-preview.74",
+    "@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.74",
+    "@microsoft/kiota-serialization-form": "^1.0.0-preview.74",
+    "@microsoft/kiota-serialization-json": "^1.0.0-preview.74",
+    "@microsoft/kiota-serialization-multipart": "^1.0.0-preview.74",
+    "@microsoft/kiota-serialization-text": "^1.0.0-preview.74",
     "express": "^5.0.1",
     "node-fetch": "^2.7.0"
   }

diff --git a/scripts/enable-shims-for-packaging.ps1 b/scripts/enable-shims-for-packaging.ps1
@@ -0,0 +1,13 @@
+# This script enables the shims for packaging the project as a tool
+$csprojPath = Join-Path $PSScriptRoot "../src/kiota/kiota.csproj"
+
+$xml = [Xml] (Get-Content $csprojPath)
+
+$shimIdentifiers = $xml.CreateElement("PackAsToolShimRuntimeIdentifiers")
+$shimIdentifiers.InnerText = "win-x64;win-x86;osx-x64"
+
+$rootPropertyGroup = $xml.Project.PropertyGroup[0]
+$rootPropertyGroup.AppendChild($shimIdentifiers)
+
+#save xml to csproj
+$xml.Save($csprojPath)
diff --git a/src/Kiota.Builder/Kiota.Builder.csproj b/src/Kiota.Builder/Kiota.Builder.csproj
@@ -38,12 +38,12 @@
     <PackageReference Include="AsyncKeyedLock" Version="7.0.2" />
     <PackageReference Include="DotNet.Glob" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.13.2" />
-    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.13.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.13.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.13.2" />
-    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.13.2" />
-    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.13.2" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.14.0" />
+    <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.14.0" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.14.0" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.14.0" />
+    <PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.14.0" />
+    <PackageReference Include="Microsoft.kiota.Serialization.Multipart" Version="1.14.0" />
     <PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.5-preview" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.22" />