Skip to content

Merge dev into main #1297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrueastman merged 18 commits into from
Nov 13, 2024
Merged

Merge dev into main #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5cf3d6a
chore(deps): bump apidoctor from `70e1e2a` to `e1742c2`
dependabot[bot] Oct 23, 2024
9e1a075
Merge pull request #1287 from microsoftgraph/dependabot/submodules/ap…
andrueastman Oct 23, 2024
ec06c4b
chore(deps): bump actions/setup-dotnet from 4.0.1 to 4.1.0
dependabot[bot] Oct 25, 2024
18ee454
Merge pull request #1288 from microsoftgraph/dependabot/github_action…
andrueastman Oct 25, 2024
44dfeb9
chore(deps): bump submodules/vipr from `f2258be` to `37766c3`
dependabot[bot] Oct 28, 2024
ec61cc1
Merge pull request #1289 from microsoftgraph/dependabot/submodules/su…
andrueastman Oct 28, 2024
32294b2
chore(deps): bump apidoctor from `e1742c2` to `a34a80d`
dependabot[bot] Nov 1, 2024
05094f0
Merge pull request #1290 from microsoftgraph/dependabot/submodules/ap…
andrueastman Nov 1, 2024
d1ce811
chore(deps): bump MSTest.TestAdapter from 3.6.1 to 3.6.2
dependabot[bot] Nov 4, 2024
b925fd7
Merge pull request #1291 from microsoftgraph/dependabot/nuget/MSTest.…
andrueastman Nov 4, 2024
998a7d6
chore(deps): bump MSTest.TestFramework from 3.6.1 to 3.6.2
dependabot[bot] Nov 5, 2024
5697bb5
Merge pull request #1292 from microsoftgraph/dependabot/nuget/MSTest.…
andrueastman Nov 5, 2024
5ddf3a3
chore(deps): bump submodules/vipr from `37766c3` to `f43c7ba`
dependabot[bot] Nov 12, 2024
515ac45
Merge pull request #1294 from microsoftgraph/dependabot/submodules/su…
andrueastman Nov 12, 2024
d040b10
fix: pin hidi version for now
Nov 12, 2024
73035a9
Merge pull request #1295 from microsoftgraph/andrueastman/pinHidi
andrueastman Nov 12, 2024
076b8b1
chore(deps): bump MSTest.TestAdapter from 3.6.2 to 3.6.3
dependabot[bot] Nov 13, 2024
6da8da5
Merge pull request #1296 from microsoftgraph/dependabot/nuget/MSTest.…
andrueastman Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/generation-templates/capture-openapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- template: checkout-metadata.yml
- template: use-dotnet-sdk.yml

- pwsh: dotnet tool install -g Microsoft.OpenApi.Hidi --prerelease
- pwsh: dotnet tool install --global Microsoft.OpenApi.Hidi --version 1.4.14
displayName: install hidi

- pwsh: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
submodules: recursive
- name: Setup .NET
uses: actions/setup-dotnet@v4.0.1
uses: actions/setup-dotnet@v4.1.0
with:
dotnet-version: 8.0.x
- name: Restore dependencies
Expand Down
4 changes: 2 additions & 2 deletions GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter">
<Version>3.6.1</Version>
<Version>3.6.3</Version>
</PackageReference>
<PackageReference Include="MSTest.TestFramework">
<Version>3.6.1</Version>
<Version>3.6.2</Version>
</PackageReference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion apidoctor
Open in desktop
Submodule apidoctor updated 2 files
+2 −2 .github/workflows/dotnet.yml
+2 −2 ApiDoctor.Validation/ApiDoctor.Validation.csproj
2 changes: 1 addition & 1 deletion submodules/vipr
Open in desktop
Submodule vipr updated 2 files
+1 −1 .github/workflows/dotnet.yml
+1 −1 src/Core/Vipr/Vipr.csproj
Loading