Merge branch 'main' into dependabot/github_actions/actions/upload-artifact-6

Author: gavinbarron

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "6.58.0"
+    ".": "6.60.0"
 }

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.60.0](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.59.0...v6.60.0) (2026-01-07)
+
+
+### Features
+
+* **generation:** update request builders and models ([dcdbea3](https://github.com/microsoftgraph/msgraph-sdk-java/commit/dcdbea34881a4e33416770a9ed2e3be544cc0dc5))
+
+## [6.59.0](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.58.0...v6.59.0) (2025-12-17)
+
+
+### Features
+
+* **generation:** update request builders and models ([19f7cd8](https://github.com/microsoftgraph/msgraph-sdk-java/commit/19f7cd87690c0224d6450960f817cda9c8a2dfed))
+
 ## [6.58.0](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.57.0...v6.58.0) (2025-12-03)
 
 

README.md

@@ -20,7 +20,7 @@ repositories {
 dependencies {
     // Include the sdk as a dependency
     // x-release-please-start-version
-    implementation 'com.microsoft.graph:microsoft-graph:6.58.0'
+    implementation 'com.microsoft.graph:microsoft-graph:6.60.0'
     // x-release-please-end
     // This dependency is only needed if you are using a TokenCredential object for authentication
     implementation 'com.azure:azure-identity:1.15.0'
@@ -37,7 +37,7 @@ Add the dependency in `dependencies` in pom.xml
   <groupId>com.microsoft.graph</groupId>
   <artifactId>microsoft-graph</artifactId>
   <!--x-release-please-start-version-->
-  <version>6.58.0</version>
+  <version>6.60.0</version>
   <!--x-release-please-end-->
 </dependency>
 <dependency>

android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
         classpath "com.gradle:gradle-enterprise-gradle-plugin:3.19.2"
         classpath "gradle.plugin.com.github.viswaramamoorthy:gradle-util-plugins:0.1.0-RELEASE"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.53.0"
-        classpath "com.android.tools.build:gradle:8.13.1"
+        classpath "com.android.tools.build:gradle:8.13.2"
     }
 }
 

gradle.properties

@@ -29,7 +29,7 @@ mavenArtifactId      = microsoft-graph
 mavenMajorVersion = 6
 # x-release-please-end
 # x-release-please-start-minor
-mavenMinorVersion = 58
+mavenMinorVersion = 60
 # x-release-please-end
 # x-release-please-start-patch
 mavenPatchVersion = 0

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.microsoft.graph</groupId>
     <artifactId>microsoft-graph</artifactId>
-    <version>6.58.0</version>
+    <version>6.60.0</version>
     <packaging>pom</packaging>
 
     <properties>

src/main/java/com/microsoft/graph/generated/admin/AdminRequestBuilder.java

@@ -6,6 +6,7 @@
 import com.microsoft.graph.admin.reportsettings.ReportSettingsRequestBuilder;
 import com.microsoft.graph.admin.serviceannouncement.ServiceAnnouncementRequestBuilder;
 import com.microsoft.graph.admin.sharepoint.SharepointRequestBuilder;
+import com.microsoft.graph.admin.teams.TeamsRequestBuilder;
 import com.microsoft.graph.models.Admin;
 import com.microsoft.graph.models.odataerrors.ODataError;
 import com.microsoft.kiota.BaseRequestBuilder;
@@ -74,6 +75,14 @@ public ServiceAnnouncementRequestBuilder serviceAnnouncement() {
     public SharepointRequestBuilder sharepoint() {
         return new SharepointRequestBuilder(pathParameters, requestAdapter);
     }
+    /**
+     * Provides operations to manage the teams property of the microsoft.graph.admin entity.
+     * @return a {@link TeamsRequestBuilder}
+     */
+    @jakarta.annotation.Nonnull
+    public TeamsRequestBuilder teams() {
+        return new TeamsRequestBuilder(pathParameters, requestAdapter);
+    }
     /**
      * Instantiates a new {@link AdminRequestBuilder} and sets the default values.
      * @param pathParameters Path parameters for the request

src/main/java/com/microsoft/graph/generated/admin/teams/TeamsRequestBuilder.java

@@ -0,0 +1,237 @@
+package com.microsoft.graph.admin.teams;
+
+import com.microsoft.graph.admin.teams.userconfigurations.UserConfigurationsRequestBuilder;
+import com.microsoft.graph.models.odataerrors.ODataError;
+import com.microsoft.graph.models.teamsadministration.TeamsAdminRoot;
+import com.microsoft.kiota.BaseRequestBuilder;
+import com.microsoft.kiota.BaseRequestConfiguration;
+import com.microsoft.kiota.HttpMethod;
+import com.microsoft.kiota.QueryParameters;
+import com.microsoft.kiota.RequestAdapter;
+import com.microsoft.kiota.RequestInformation;
+import com.microsoft.kiota.RequestOption;
+import com.microsoft.kiota.serialization.Parsable;
+import com.microsoft.kiota.serialization.ParsableFactory;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+/**
+ * Provides operations to manage the teams property of the microsoft.graph.admin entity.
+ */
+@jakarta.annotation.Generated("com.microsoft.kiota")
+public class TeamsRequestBuilder extends BaseRequestBuilder {
+    /**
+     * Provides operations to manage the userConfigurations property of the microsoft.graph.teamsAdministration.teamsAdminRoot entity.
+     * @return a {@link UserConfigurationsRequestBuilder}
+     */
+    @jakarta.annotation.Nonnull
+    public UserConfigurationsRequestBuilder userConfigurations() {
+        return new UserConfigurationsRequestBuilder(pathParameters, requestAdapter);
+    }
+    /**
+     * Instantiates a new {@link TeamsRequestBuilder} and sets the default values.
+     * @param pathParameters Path parameters for the request
+     * @param requestAdapter The request adapter to use to execute the requests.
+     */
+    public TeamsRequestBuilder(@jakarta.annotation.Nonnull final HashMap<String, Object> pathParameters, @jakarta.annotation.Nonnull final RequestAdapter requestAdapter) {
+        super(requestAdapter, "{+baseurl}/admin/teams{?%24expand,%24select}", pathParameters);
+    }
+    /**
+     * Instantiates a new {@link TeamsRequestBuilder} and sets the default values.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @param requestAdapter The request adapter to use to execute the requests.
+     */
+    public TeamsRequestBuilder(@jakarta.annotation.Nonnull final String rawUrl, @jakarta.annotation.Nonnull final RequestAdapter requestAdapter) {
+        super(requestAdapter, "{+baseurl}/admin/teams{?%24expand,%24select}", rawUrl);
+    }
+    /**
+     * Delete navigation property teams for admin
+     * @throws ODataError When receiving a 4XX or 5XX status code
+     */
+    public void delete() {
+        delete(null);
+    }
+    /**
+     * Delete navigation property teams for admin
+     * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
+     * @throws ODataError When receiving a 4XX or 5XX status code
+     */
+    public void delete(@jakarta.annotation.Nullable final java.util.function.Consumer<DeleteRequestConfiguration> requestConfiguration) {
+        final RequestInformation requestInfo = toDeleteRequestInformation(requestConfiguration);
+        final HashMap<String, ParsableFactory<? extends Parsable>> errorMapping = new HashMap<String, ParsableFactory<? extends Parsable>>();
+        errorMapping.put("XXX", ODataError::createFromDiscriminatorValue);
+        this.requestAdapter.sendPrimitive(requestInfo, errorMapping, Void.class);
+    }
+    /**
+     * Represents a collection of user configurations.
+     * @return a {@link TeamsAdminRoot}
+     * @throws ODataError When receiving a 4XX or 5XX status code
+     */
+    @jakarta.annotation.Nullable
+    public TeamsAdminRoot get() {
+        return get(null);
+    }
+    /**
+     * Represents a collection of user configurations.
+     * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
+     * @return a {@link TeamsAdminRoot}
+     * @throws ODataError When receiving a 4XX or 5XX status code
+     */
+    @jakarta.annotation.Nullable
+    public TeamsAdminRoot get(@jakarta.annotation.Nullable final java.util.function.Consumer<GetRequestConfiguration> requestConfiguration) {
+        final RequestInformation requestInfo = toGetRequestInformation(requestConfiguration);
+        final HashMap<String, ParsableFactory<? extends Parsable>> errorMapping = new HashMap<String, ParsableFactory<? extends Parsable>>();
+        errorMapping.put("XXX", ODataError::createFromDiscriminatorValue);
+        return this.requestAdapter.send(requestInfo, errorMapping, TeamsAdminRoot::createFromDiscriminatorValue);
+    }
+    /**
+     * Update the navigation property teams in admin
+     * @param body The request body
+     * @return a {@link TeamsAdminRoot}
+     * @throws ODataError When receiving a 4XX or 5XX status code
+     */
+    @jakarta.annotation.Nullable
+    public TeamsAdminRoot patch(@jakarta.annotation.Nonnull final TeamsAdminRoot body) {
+        return patch(body, null);
+    }
+    /**
+     * Update the navigation property teams in admin
+     * @param body The request body
+     * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
+     * @return a {@link TeamsAdminRoot}
+     * @throws ODataError When receiving a 4XX or 5XX status code
+     */
+    @jakarta.annotation.Nullable
+    public TeamsAdminRoot patch(@jakarta.annotation.Nonnull final TeamsAdminRoot body, @jakarta.annotation.Nullable final java.util.function.Consumer<PatchRequestConfiguration> requestConfiguration) {
+        Objects.requireNonNull(body);
+        final RequestInformation requestInfo = toPatchRequestInformation(body, requestConfiguration);
+        final HashMap<String, ParsableFactory<? extends Parsable>> errorMapping = new HashMap<String, ParsableFactory<? extends Parsable>>();
+        errorMapping.put("XXX", ODataError::createFromDiscriminatorValue);
+        return this.requestAdapter.send(requestInfo, errorMapping, TeamsAdminRoot::createFromDiscriminatorValue);
+    }
+    /**
+     * Delete navigation property teams for admin
+     * @return a {@link RequestInformation}
+     */
+    @jakarta.annotation.Nonnull
+    public RequestInformation toDeleteRequestInformation() {
+        return toDeleteRequestInformation(null);
+    }
+    /**
+     * Delete navigation property teams for admin
+     * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
+     * @return a {@link RequestInformation}
+     */
+    @jakarta.annotation.Nonnull
+    public RequestInformation toDeleteRequestInformation(@jakarta.annotation.Nullable final java.util.function.Consumer<DeleteRequestConfiguration> requestConfiguration) {
+        final RequestInformation requestInfo = new RequestInformation(HttpMethod.DELETE, urlTemplate, pathParameters);
+        requestInfo.configure(requestConfiguration, DeleteRequestConfiguration::new);
+        requestInfo.headers.tryAdd("Accept", "application/json");
+        return requestInfo;
+    }
+    /**
+     * Represents a collection of user configurations.
+     * @return a {@link RequestInformation}
+     */
+    @jakarta.annotation.Nonnull
+    public RequestInformation toGetRequestInformation() {
+        return toGetRequestInformation(null);
+    }
+    /**
+     * Represents a collection of user configurations.
+     * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
+     * @return a {@link RequestInformation}
+     */
+    @jakarta.annotation.Nonnull
+    public RequestInformation toGetRequestInformation(@jakarta.annotation.Nullable final java.util.function.Consumer<GetRequestConfiguration> requestConfiguration) {
+        final RequestInformation requestInfo = new RequestInformation(HttpMethod.GET, urlTemplate, pathParameters);
+        requestInfo.configure(requestConfiguration, GetRequestConfiguration::new, x -> x.queryParameters);
+        requestInfo.headers.tryAdd("Accept", "application/json");
+        return requestInfo;
+    }
+    /**
+     * Update the navigation property teams in admin
+     * @param body The request body
+     * @return a {@link RequestInformation}
+     */
+    @jakarta.annotation.Nonnull
+    public RequestInformation toPatchRequestInformation(@jakarta.annotation.Nonnull final TeamsAdminRoot body) {
+        return toPatchRequestInformation(body, null);
+    }
+    /**
+     * Update the navigation property teams in admin
+     * @param body The request body
+     * @param requestConfiguration Configuration for the request such as headers, query parameters, and middleware options.
+     * @return a {@link RequestInformation}
+     */
+    @jakarta.annotation.Nonnull
+    public RequestInformation toPatchRequestInformation(@jakarta.annotation.Nonnull final TeamsAdminRoot body, @jakarta.annotation.Nullable final java.util.function.Consumer<PatchRequestConfiguration> requestConfiguration) {
+        Objects.requireNonNull(body);
+        final RequestInformation requestInfo = new RequestInformation(HttpMethod.PATCH, urlTemplate, pathParameters);
+        requestInfo.configure(requestConfiguration, PatchRequestConfiguration::new);
+        requestInfo.headers.tryAdd("Accept", "application/json");
+        requestInfo.setContentFromParsable(requestAdapter, "application/json", body);
+        return requestInfo;
+    }
+    /**
+     * Returns a request builder with the provided arbitrary URL. Using this method means any other path or query parameters are ignored.
+     * @param rawUrl The raw URL to use for the request builder.
+     * @return a {@link TeamsRequestBuilder}
+     */
+    @jakarta.annotation.Nonnull
+    public TeamsRequestBuilder withUrl(@jakarta.annotation.Nonnull final String rawUrl) {
+        Objects.requireNonNull(rawUrl);
+        return new TeamsRequestBuilder(rawUrl, requestAdapter);
+    }
+    /**
+     * Configuration for the request such as headers, query parameters, and middleware options.
+     */
+    @jakarta.annotation.Generated("com.microsoft.kiota")
+    public class DeleteRequestConfiguration extends BaseRequestConfiguration {
+    }
+    /**
+     * Represents a collection of user configurations.
+     */
+    @jakarta.annotation.Generated("com.microsoft.kiota")
+    public class GetQueryParameters implements QueryParameters {
+        /**
+         * Expand related entities
+         */
+        @jakarta.annotation.Nullable
+        public String[] expand;
+        /**
+         * Select properties to be returned
+         */
+        @jakarta.annotation.Nullable
+        public String[] select;
+        /**
+         * Extracts the query parameters into a map for the URI template parsing.
+         * @return a {@link Map<String, Object>}
+         */
+        @jakarta.annotation.Nonnull
+        public Map<String, Object> toQueryParameters() {
+            final Map<String, Object> allQueryParams = new HashMap();
+            allQueryParams.put("%24expand", expand);
+            allQueryParams.put("%24select", select);
+            return allQueryParams;
+        }
+    }
+    /**
+     * Configuration for the request such as headers, query parameters, and middleware options.
+     */
+    @jakarta.annotation.Generated("com.microsoft.kiota")
+    public class GetRequestConfiguration extends BaseRequestConfiguration {
+        /**
+         * Request query parameters
+         */
+        @jakarta.annotation.Nullable
+        public GetQueryParameters queryParameters = new GetQueryParameters();
+    }
+    /**
+     * Configuration for the request such as headers, query parameters, and middleware options.
+     */
+    @jakarta.annotation.Generated("com.microsoft.kiota")
+    public class PatchRequestConfiguration extends BaseRequestConfiguration {
+    }
+}