Skip to content
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

Jump to bottom

Include json by default #88

Merged
merged 2 commits into from
Nov 12, 2022
Merged

Include json by default #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed22617
Add .json as default extension for dotnet-combine zip
eduherminio Mar 23, 2022
ba2d72f
Fix .NET version in readme
eduherminio Mar 23, 2022
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

## Installing `dotnet-combine`

.NET 5 SDK is required to use this tool. You can download it from [here](https://dotnet.microsoft.com/download/dotnet/5.0).
.NET 6 SDK is required to use this tool. You can download it from [here](https://dotnet.microsoft.com/download/dotnet/6.0).

The tool can be installed globally by running:

Expand Down Expand Up @@ -139,7 +139,7 @@ This tool can be used for more general purposes than the previous one. Some of t

- Extracting all `.css` files from a web development project.

- Extracting all the relevant source code files (`.sln`, `.csproj`, `.cs`, `.razor`, `.xaml`, etc.) from your .NET project in a GitHub Action step, to be able to make them available as an artifact.
- Extracting all the relevant source code files (`.sln`, `.csproj`, `.cs`, `.json`, `.razor`, `.xaml`, etc.) from your .NET project in a GitHub Action step, to be able to make them available as an artifact.

- ...

Expand All @@ -158,7 +158,7 @@ Usage: dotnet-combine zip <INPUT> [options]
directory.
If no filename is provided (i.e. --output dir/), a unique name will be used.

--extensions (Default: .sln .csproj .cs)
--extensions (Default: .sln .csproj .cs .json)
File extensions to include, separated by semicolons (;).

-f, --overwrite (Default: false)
Expand Down
4 changes: 2 additions & 2 deletions src/DotnetCombine/Options/ZipOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ If no dir path is provided (i.e. --output file.cs), the file will be created in
If no filename is provided (i.e. --output dir/), a unique name will be used.")]
public string? Output { get; set; }

[Option(longName: "extensions", Required = false, Separator = ';', Default = new[] { ".sln", ".csproj", ".cs" }, HelpText = @"
[Option(longName: "extensions", Required = false, Separator = ';', Default = new[] { ".sln", ".csproj", ".cs", ".json" }, HelpText = @"
File extensions to include, separated by semicolons (;).")]
public IEnumerable<string> Extensions { get; set; } = new[] { ".cs", ".csproj", ".sln" };
public IEnumerable<string> Extensions { get; set; } = new[] { ".sln", ".csproj", ".cs", ".json" };

[Option(shortName: 'f', longName: "overwrite", Required = false, Default = false, HelpText = @"
Overwrites the output file (if it exists).")]
Expand Down