Skip to content

Commit 2ea4bc7

Browse files
Merge pull request #1471 from microsoftgraph/v1.0/pipelinebuild/117217
Generated models and request builders
2 parents add5797 + 6c46b2d commit 2ea4bc7

File tree

9 files changed

+35
-8
lines changed

9 files changed

+35
-8
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14+
## [5.61.0] - 2023-06-16
15+
16+
### Changed
17+
18+
- Generated v1.0 models and request builders using Typewriter.
19+
1420
## [5.60.0] - 2023-06-09
1521

1622
### Added

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919
2020
dependencies {
2121
// Include the sdk as a dependency
22-
implementation 'com.microsoft.graph:microsoft-graph:5.60.0'
22+
implementation 'com.microsoft.graph:microsoft-graph:5.61.0'
2323
// Uncomment the line below if you are building an android application
2424
//implementation 'com.google.guava:guava:30.1.1-android'
2525
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
@@ -36,7 +36,7 @@ Add the dependency in `dependencies` in pom.xml
3636
<!-- Include the sdk as a dependency -->
3737
<groupId>com.microsoft.graph</groupId>
3838
<artifactId>microsoft-graph</artifactId>
39-
<version>5.60.0</version>
39+
<version>5.61.0</version>
4040
</dependency>
4141
<dependency>
4242
<!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
@@ -191,5 +191,6 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI
191191

192192

193193

194+
194195

195196

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ apply plugin: "com.github.ben-manes.versions"
2525
android {
2626
namespace 'com.microsoft.graph'
2727

28-
compileSdkVersion 33
28+
compileSdkVersion 34
2929

3030
defaultConfig {
3131
versionCode 1
3232
versionName "1.0"
3333
minSdkVersion 26
34-
targetSdkVersion 33
34+
targetSdkVersion 34
3535
}
3636

3737
buildTypes {

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ org.gradle.caching=true
2626
mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph
2828
mavenMajorVersion = 5
29-
mavenMinorVersion = 60
29+
mavenMinorVersion = 61
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232

@@ -114,5 +114,6 @@ mavenCentralPublishingEnabled=false
114114

115115

116116

117+
117118

118119

src/main/java/com/microsoft/graph/info/Constants.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private Constants() {
1818
/** The client secret to use for unit testing */
1919
public static final String CLIENTSECRET = "clientsecret";
2020
/** The SDK version */
21-
public static final String VERSION_NAME = "5.60.0";
21+
public static final String VERSION_NAME = "5.61.0";
2222
}
2323

2424

@@ -91,5 +91,6 @@ private Constants() {
9191

9292

9393

94+
9495

9596

src/main/java/com/microsoft/graph/models/LearningProvider.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ public class LearningProvider extends Entity implements IJsonBackedObject {
3636
@Nullable
3737
public String displayName;
3838

39+
/**
40+
* The Is Course Activity Sync Enabled.
41+
* Indicates whether a provider can ingest learning course activity records. The default value is false. Set to true to make learningCourseActivities available for this provider.
42+
*/
43+
@SerializedName(value = "isCourseActivitySyncEnabled", alternate = {"IsCourseActivitySyncEnabled"})
44+
@Expose
45+
@Nullable
46+
public Boolean isCourseActivitySyncEnabled;
47+
3948
/**
4049
* The Login Web Url.
4150
* Authentication URL to access the courses for the provider. Optional.

src/main/java/com/microsoft/graph/models/LicenseUnitsDetail.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ public final AdditionalDataManager additionalDataManager() {
4646
@Nullable
4747
public Integer enabled;
4848

49+
/**
50+
* The Locked Out.
51+
*
52+
*/
53+
@SerializedName(value = "lockedOut", alternate = {"LockedOut"})
54+
@Expose
55+
@Nullable
56+
public Integer lockedOut;
57+
4958
/**
5059
* The Suspended.
5160
* The number of units that are suspended because the subscription of the service SKU has been cancelled. The units cannot be assigned but can still be reactivated before they are deleted.

src/main/java/com/microsoft/graph/models/ProvisioningStatusInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public final AdditionalDataManager additionalDataManager() {
4141

4242
/**
4343
* The Error Information.
44-
*
44+
* If status is not success/ skipped details for the error are contained in this.
4545
*/
4646
@SerializedName(value = "errorInformation", alternate = {"ErrorInformation"})
4747
@Expose

src/main/java/com/microsoft/graph/models/User.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public class User extends DirectoryObject implements IJsonBackedObject {
369369

370370
/**
371371
* The Mobile Phone.
372-
* The primary cellular telephone number for the user. Read-only for users synced from on-premises directory. Maximum length is 64 characters. Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values).
372+
* The primary cellular telephone number for the user. Read-only for users synced from on-premises directory. Maximum length is 64 characters. Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values) and $search.
373373
*/
374374
@SerializedName(value = "mobilePhone", alternate = {"MobilePhone"})
375375
@Expose

0 commit comments

Comments
 (0)