Skip to content
This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Commit f2bc032

Browse files
committed
Switch from submodule to nuget package for CLI core
1 parent f955a14 commit f2bc032

File tree

6 files changed

+6
-10
lines changed

6 files changed

+6
-10
lines changed

.github/workflows/build-cli.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
env:
1111
MS_NUGET_URL: https://nuget.pkg.github.com/microsoft/index.json
12+
MSGRAPH_NUGET_URL: https://nuget.pkg.github.com/microsoftgraph/index.json
1213
steps:
1314
- name: Checkout
1415
uses: actions/checkout@v3
@@ -22,6 +23,7 @@ jobs:
2223
# NOTE: Password encryption is not supported for the linux platform (Encryption is only supported on Windows platforms.)
2324
run: |
2425
dotnet nuget add source ${{env.MS_NUGET_URL}} -n ms-gh -u ${{secrets.NUGET_USER}} -p ${{secrets.NUGET_PASSWORD}} --store-password-in-clear-text
26+
dotnet nuget add source ${{env.MSGRAPH_NUGET_URL}} -n msgraph-gh -u ${{secrets.NUGET_USER}} -p ${{secrets.NUGET_PASSWORD}} --store-password-in-clear-text
2527
- uses: actions/cache@v3
2628
with:
2729
path: ~/.nuget/packages

.github/workflows/release-cli.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
rid: ['win-x64', 'osx-x64', 'linux-x64']
1717
env:
1818
MS_NUGET_URL: https://nuget.pkg.github.com/microsoft/index.json
19+
MSGRAPH_NUGET_URL: https://nuget.pkg.github.com/microsoftgraph/index.json
1920
PACKAGE_VERSION: ${{github.event.inputs.tag || github.ref_name || 'v0.1.0'}}
2021
PACKAGE_ZIP_TEMPLATE: "msgraph-cli-{0}-{1}.zip"
2122
OUTPUT_DIR: /tmp/publish
@@ -37,6 +38,7 @@ jobs:
3738
# NOTE: Password encryption is not supported for the linux platform (Encryption is only supported on Windows platforms.)
3839
run: |
3940
dotnet nuget add source ${{env.MS_NUGET_URL}} -n ms-gh -u ${{secrets.NUGET_USER}} -p ${{secrets.NUGET_PASSWORD}} --store-password-in-clear-text
41+
dotnet nuget add source ${{env.MSGRAPH_NUGET_URL}} -n msgraph-gh -u ${{secrets.NUGET_USER}} -p ${{secrets.NUGET_PASSWORD}} --store-password-in-clear-text
4042
- uses: actions/cache@v3
4143
with:
4244
path: ~/.nuget/packages

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[submodule "msgraph-cli-core"]
2-
path = msgraph-cli-core
3-
url = https://github.com/microsoftgraph/msgraph-cli-core.git
4-
branch = main

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build-env
77

88
ARG MS_NUGET_URL=https://nuget.pkg.github.com/microsoft/index.json
9+
ARG MSGRAPH_NUGET_URL=https://nuget.pkg.github.com/microsoftgraph/index.json
910

1011
WORKDIR /app
1112

msgraph-cli-core

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/msgraph-cli.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,8 @@
2323
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
2424
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
2525
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
26+
<PackageReference Include="Microsoft.Graph.Cli.Core" Version="0.1.1-preview.1" />
2627
<PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.0.0-preview.1" />
2728
<PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22114.1" />
2829
</ItemGroup>
29-
30-
<ItemGroup>
31-
<ProjectReference Include="..\msgraph-cli-core\src\Microsoft.Graph.Cli.Core\Microsoft.Graph.Cli.Core.csproj" />
32-
</ItemGroup>
33-
3430
</Project>

0 commit comments

Comments
 (0)