Skip to content

Commit

Permalink
Update binaries name pattern (#11)
Browse files Browse the repository at this point in the history
* Update binaries name pattern

* Rename project files
  • Loading branch information
calebkiage authored Aug 9, 2023
1 parent 75e88b3 commit a537b52
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .azure-pipelines/release-cli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ trigger:
include:
- .azure-pipelines
- src
- msgraph-cli-beta.sln
- msgraph-beta-cli.sln

pool:
name: Azure Pipelines
Expand All @@ -20,7 +20,7 @@ variables:
- name: repositoryConnection
value: 'GitHub - calebkiage'
- name: fileNameTemplate
value: msgraph-cli-beta-{0}-{1}
value: msgraph-beta-cli-{0}-{1}
- name: buildConfiguration
value: 'Release'
- name: outputDir
Expand Down Expand Up @@ -120,7 +120,7 @@ stages:
parameters:
vstsFeedName: ${{variables.internalFeed}}

- pwsh: dotnet publish ./src/msgraph-cli-beta.csproj --no-restore --runtime $(rid) --self-contained true --configuration $(buildConfiguration) --output $(outputDir)
- pwsh: dotnet publish ./src/msgraph-beta-cli.csproj --no-restore --runtime $(rid) --self-contained true --configuration $(buildConfiguration) --output $(outputDir)
workingDirectory: $(Build.SourcesDirectory)
condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true'))
displayName: DotNet publish
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{y[a]ml,json}]
[*.{yml,yaml,json}]
indent_size = 2

# VSCode generates files with 4 spaces
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"omnisharp.organizeImportsOnFormat": true
"omnisharp.organizeImportsOnFormat": true,
"dotnet.defaultSolution": "msgraph-beta-cli.sln"
}
6 changes: 3 additions & 3 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/msgraph-cli-beta.csproj",
"${workspaceFolder}/src/msgraph-beta-cli.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
Expand All @@ -19,7 +19,7 @@
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/msgraph-cli-beta.csproj",
"${workspaceFolder}/src/msgraph-beta-cli.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
Expand All @@ -32,7 +32,7 @@
"args": [
"watch",
"run",
"${workspaceFolder}/src/msgraph-cli-beta.csproj",
"${workspaceFolder}/src/msgraph-beta-cli.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ ARG MSGRAPH_NUGET_URL=https://nuget.pkg.github.com/microsoftgraph/index.json

WORKDIR /app

COPY ./src ./msgraph-cli-beta/src
WORKDIR /app/msgraph-cli-beta
COPY ./src ./msgraph-beta-cli/src
WORKDIR /app/msgraph-beta-cli

# RUN apk add gcc --no-cache # Uncomment this if PublishAot is enabled

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
mgc:
image: msgraph-cli-beta
image: msgraph-beta-cli
cap_add:
# https://man7.org/linux/man-pages/man7/capabilities.7.html
#
Expand Down
6 changes: 3 additions & 3 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $ docker-compose run -it mgc-beta sh

Otherwise use docker to run the container.
```sh
$ docker run -it --cap-add=IPC_LOCK --rm msgraph-cli-beta sh
$ docker run -it --cap-add=IPC_LOCK --rm msgraph-beta-cli sh
```

> The IPC_LOCK capability is required by the `gnome-keyring-daemon` process which
Expand All @@ -24,7 +24,7 @@ GitHub organizations' package registries.

To build an image in windows powershell:
```powershell
$ docker build \\?\$(Get-Location) -f . -t msgraph-cli-beta --secret id=user,src=./tmp/nuget_user.txt --secret id=token,src=./tmp/nuget_token.txt
$ docker build \\?\$(Get-Location) -f . -t msgraph-beta-cli --secret id=user,src=./tmp/nuget_user.txt --secret id=token,src=./tmp/nuget_token.txt
```

> The `\\?\$(Get-Location)` section of the command is used to get around the 260 character
Expand All @@ -34,5 +34,5 @@ $ docker build \\?\$(Get-Location) -f . -t msgraph-cli-beta --secret id=user,src
To build an image in linux or WSL:
```sh
$ docker build -t msgraph-cli-beta --secret id=user,src=./tmp/nuget_user.txt --secret id=token,src=./tmp/nuget_token.txt .
$ docker build -t msgraph-beta-cli --secret id=user,src=./tmp/nuget_user.txt --secret id=token,src=./tmp/nuget_token.txt .
```
2 changes: 1 addition & 1 deletion msgraph-cli-beta.sln → msgraph-beta-cli.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "msgraph-cli-beta", "src\msgraph-cli-beta.csproj", "{34F8C103-4AEF-4307-87CA-9D371DF30470}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "msgraph-beta-cli", "src\msgraph-beta-cli.csproj", "{34F8C103-4AEF-4307-87CA-9D371DF30470}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
File renamed without changes.

0 comments on commit a537b52

Please sign in to comment.