Skip to content

Commit e15deb0

Browse files
NickRimmerNickRimmer
authored
Merge pull request #2 from RestApia/feature/tag-embedded-set
Replace NuGet tag to Embedded, to exclude from search
2 parents a4ad436 + db6e173 commit e15deb0

File tree

13 files changed

+161
-36
lines changed

13 files changed

+161
-36
lines changed

‎.build/Pipelines/GitHubActions.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,14 @@
3030
// Continuous Integration: Validate pull requests
3131
[GitHubActions(
3232
"pr-validation",
33-
GitHubActionsImage.UbuntuLatest,
33+
GitHubActionsImage.WindowsLatest,
3434
InvokedTargets = [
3535
nameof(Solution_Build),
3636
],
37-
OnPullRequestBranches = ["master"]
37+
OnPullRequestBranches = ["main"]
3838
)]
39-
[SuppressMessage("ReSharper", "CheckNamespace")]
4039

41-
// CI/CD targets
40+
[SuppressMessage("ReSharper", "CheckNamespace")]
4241
partial class Build
4342
{
4443
Target UpdateYaml => _ => _.Executes(() => Log.Information("Generating YAML..."));

‎.build/Targets/Solution_Targets.cs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.IO;
44
using System.Linq;
55
using Nuke.Common;
6+
using Nuke.Common.Tooling;
67
using Nuke.Common.Tools.DotNet;
78
using static Nuke.Common.Tools.DotNet.DotNetTasks;
89

‎.github/workflows/pr-validation.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ name: pr-validation
1919
on:
2020
pull_request:
2121
branches:
22-
- master
22+
- main
2323

2424
jobs:
25-
ubuntu-latest:
26-
name: ubuntu-latest
27-
runs-on: ubuntu-latest
25+
windows-latest:
26+
name: windows-latest
27+
runs-on: windows-latest
2828
steps:
2929
- uses: actions/checkout@v4
3030
- name: 'Cache: .nuke/temp, ~/.nuget/packages'

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.vs/
33
.vscode/
44
.idea
5-
.nuke/
5+
.nuke/temp/
66
[Bb]in/
77
[Oo]bj/
88
packages/

‎.nuke/build.schema.json

+138
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-04/schema#",
3+
"properties": {
4+
"Configuration": {
5+
"type": "string",
6+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
7+
"enum": [
8+
"Debug",
9+
"Release"
10+
]
11+
},
12+
"ExtensionLibVersion": {
13+
"type": "string",
14+
"description": "Extension library version"
15+
},
16+
"ExtensionName": {
17+
"type": "string",
18+
"description": "Extension library name"
19+
},
20+
"PushApiKey": {
21+
"type": "string",
22+
"description": "NuGet push API key"
23+
},
24+
"SharedLibVersion": {
25+
"type": "string",
26+
"description": "Shared library version"
27+
},
28+
"Solution": {
29+
"type": "string",
30+
"description": "Path to a solution file that is automatically loaded"
31+
}
32+
},
33+
"definitions": {
34+
"Host": {
35+
"type": "string",
36+
"enum": [
37+
"AppVeyor",
38+
"AzurePipelines",
39+
"Bamboo",
40+
"Bitbucket",
41+
"Bitrise",
42+
"GitHubActions",
43+
"GitLab",
44+
"Jenkins",
45+
"Rider",
46+
"SpaceAutomation",
47+
"TeamCity",
48+
"Terminal",
49+
"TravisCI",
50+
"VisualStudio",
51+
"VSCode"
52+
]
53+
},
54+
"ExecutableTarget": {
55+
"type": "string",
56+
"enum": [
57+
"Extension_Build",
58+
"Extension_FindNextVersion",
59+
"Extension_Push",
60+
"Shared_Build",
61+
"Shared_FindNextVersion",
62+
"Shared_Push",
63+
"Solution_Build",
64+
"Solution_Clean",
65+
"Solution_Restore",
66+
"UpdateYaml"
67+
]
68+
},
69+
"Verbosity": {
70+
"type": "string",
71+
"description": "",
72+
"enum": [
73+
"Verbose",
74+
"Normal",
75+
"Minimal",
76+
"Quiet"
77+
]
78+
},
79+
"NukeBuild": {
80+
"properties": {
81+
"Continue": {
82+
"type": "boolean",
83+
"description": "Indicates to continue a previously failed build attempt"
84+
},
85+
"Help": {
86+
"type": "boolean",
87+
"description": "Shows the help text for this build assembly"
88+
},
89+
"Host": {
90+
"description": "Host for execution. Default is 'automatic'",
91+
"$ref": "#/definitions/Host"
92+
},
93+
"NoLogo": {
94+
"type": "boolean",
95+
"description": "Disables displaying the NUKE logo"
96+
},
97+
"Partition": {
98+
"type": "string",
99+
"description": "Partition to use on CI"
100+
},
101+
"Plan": {
102+
"type": "boolean",
103+
"description": "Shows the execution plan (HTML)"
104+
},
105+
"Profile": {
106+
"type": "array",
107+
"description": "Defines the profiles to load",
108+
"items": {
109+
"type": "string"
110+
}
111+
},
112+
"Root": {
113+
"type": "string",
114+
"description": "Root directory during build execution"
115+
},
116+
"Skip": {
117+
"type": "array",
118+
"description": "List of targets to be skipped. Empty list skips all dependencies",
119+
"items": {
120+
"$ref": "#/definitions/ExecutableTarget"
121+
}
122+
},
123+
"Target": {
124+
"type": "array",
125+
"description": "List of targets to be invoked. Default is '{default_target}'",
126+
"items": {
127+
"$ref": "#/definitions/ExecutableTarget"
128+
}
129+
},
130+
"Verbosity": {
131+
"description": "Logging verbosity during build execution. Default is 'Normal'",
132+
"$ref": "#/definitions/Verbosity"
133+
}
134+
}
135+
}
136+
},
137+
"$ref": "#/definitions/NukeBuild"
138+
}

‎.nuke/parameters.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "build.schema.json",
3+
"Solution": "RestApia.Shared.sln"
4+
}

‎build.cmd

100644100755
File mode changed.

‎nuget.config

-6
This file was deleted.

‎src/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@
4040
</PackageReference>
4141
<AdditionalFiles Include="$(SolutionDir)/src/stylecop.json"/>
4242
</ItemGroup>
43-
4443
</Project>

‎src/Extensions/Directory.Build.props

+8-10
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,21 @@
66
<RepositoryUrl>https://github.com/RestApia/RestApia.Shared</RepositoryUrl>
77
<PackageLicenseExpression>MIT</PackageLicenseExpression>
88
<PackageReadmeFile>README.md</PackageReadmeFile>
9-
<PackageTags>RestApia, Extension</PackageTags>
109
</PropertyGroup>
1110

1211
<ItemGroup>
1312
<None Include="README.md" Pack="true" PackagePath="\"/>
1413
</ItemGroup>
1514

16-
<Target Name="PublishToLocal" AfterTargets="Pack" Condition="'$(Configuration)' == 'Debug'">
17-
<ItemGroup>
18-
<NuGetPackages Include="$(PackageOutputPath)*.nupkg"/>
19-
</ItemGroup>
20-
<Message Text="NuGetPackages: @(NuGetPackages)" Importance="high"/>
21-
<Copy SourceFiles="@(NuGetPackages)" DestinationFolder="$(ProjectDir)..\..\..\.local\nugets"/>
22-
</Target>
23-
2415
<ItemGroup>
25-
<PackageReference Include="RestApia.Shared" Version="1.0.4" />
16+
</ItemGroup>
17+
18+
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
19+
<ProjectReference Include="..\..\RestApia.Shared\RestApia.Shared.csproj" />
20+
</ItemGroup>
21+
22+
<ItemGroup Condition="'$(Configuration)' != 'Debug'">
23+
<PackageReference Include="RestApia.Shared" Version="1.*" />
2624
</ItemGroup>
2725

2826
</Project>

‎src/Extensions/RestApia.Extensions.Auth.Basic/RestApia.Extensions.Auth.Basic.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<Title>Basic Authorization extension</Title>
44
<Description>Generate Authorization header based on settings for requests.</Description>
55
<RepositoryUrl>https://github.com/RestApia/RestApia.Shared/tree/main/src/Extensions/RestApia.Extensions.Auth.Basic</RepositoryUrl>
6-
<Version>1.0.6</Version>
6+
<PackageTags>RestApiaEmbedded, Extension</PackageTags>
77
</PropertyGroup>
88
</Project>

‎src/Extensions/RestApia.Extensions.Auth.OAuth2/RestApia.Extensions.Auth.OAuth2.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PropertyGroup>
33
<Title>OAuth2 Authorization extension</Title>
44
<Description>Extension provides OAuth2 Implicit and AuthCode authorizations</Description>
5-
<Version>1.0.6</Version>
65
<RepositoryUrl>https://github.com/RestApia/RestApia.Shared/tree/main/src/Extensions/RestApia.Extensions.Auth.OAuth2</RepositoryUrl>
6+
<PackageTags>RestApiaEmbedded, Extension</PackageTags>
77
</PropertyGroup>
88

99
<ItemGroup>

‎src/RestApia.Shared/RestApia.Shared.csproj

-8
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,4 @@
1414
<ItemGroup>
1515
<None Include="README.md" Pack="true" PackagePath="\"/>
1616
</ItemGroup>
17-
18-
<Target Name="PublishToLocal" AfterTargets="Pack" Condition="'$(Configuration)' == 'Debug'">
19-
<ItemGroup>
20-
<NuGetPackages Include="$(PackageOutputPath)RestApia.Shared.*.nupkg"/>
21-
</ItemGroup>
22-
<Message Text="NuGetPackages: @(NuGetPackages)" Importance="high"/>
23-
<Copy SourceFiles="@(NuGetPackages)" DestinationFolder="$(ProjectDir)..\..\.local\nugets"/>
24-
</Target>
2517
</Project>

0 commit comments

Comments
 (0)