Skip to content

Commit f255dc1

Browse files
Merge branch 'develop'
2 parents 8434854 + 007933c commit f255dc1

File tree

248 files changed

+24371
-590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+24371
-590
lines changed

.github/workflows/ci.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Nuget client Continuous integration
2+
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
- 'develop'
8+
- 'netcore'
9+
pull_request:
10+
branches:
11+
- '*'
12+
- '!main'
13+
jobs:
14+
build_test_pack:
15+
name: Build, test & pack
16+
runs-on: windows-latest
17+
env:
18+
buildConfiguration: release
19+
versionSuffix: ${{ github.ref == 'refs/heads/develop' && '-pre-' || '-ci-' }}${{github.RUN_NUMBER }}
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@v1
23+
- name: Set up Node.js ⚙️
24+
uses: actions/setup-node@v2
25+
with:
26+
node-version: '16'
27+
- name: Setup .NET Core @ Latest
28+
uses: actions/setup-dotnet@v1
29+
with:
30+
source-url: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
31+
env:
32+
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
33+
- name: Restore
34+
run: dotnet restore PowerSlice.sln --configfile Nuget.config
35+
- name: Build (Release version)
36+
if: ${{ github.ref == 'refs/heads/main' }}
37+
run: dotnet build --no-restore --configuration $env:buildConfiguration
38+
- name: Build (Pre-Release version)
39+
if: ${{ github.ref != 'refs/heads/main' }}
40+
run: dotnet build --no-restore --configuration $env:buildConfiguration --version-suffix $env:versionSuffix
41+
- name: Test
42+
run: dotnet test --no-build --configuration $env:buildConfiguration
43+
- name: Pack (Release version)
44+
if: ${{ github.ref == 'refs/heads/main' }}
45+
run: |
46+
./build/pack.ps1
47+
- name: Pack (Pre-Release version)
48+
if: ${{ github.ref != 'refs/heads/main' }}
49+
run: |
50+
./build/pack.ps1 -versionSuffix $env:versionSuffix
51+
- name: Publish packages
52+
run: dotnet nuget push artifacts/**/*.nupkg --skip-duplicate -k ${{ secrets.GITHUB_TOKEN }}
53+

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ Desktop.ini
142142
*.egg
143143
*.egg-info
144144
dist
145-
build
146145
eggs
147146
parts
148147
bin
@@ -165,4 +164,11 @@ pip-log.txt
165164
.mr.developer.cfg
166165

167166
# Mac crap
168-
.DS_Store
167+
.DS_Store
168+
169+
## Ignore files generated or required by Episerver sample site
170+
sample/AlloyMvcTemplates/App_Data/**
171+
sample/AlloyMvcTemplates/App_Code/**
172+
/nupkgs
173+
/modules
174+
/zipoutput

NuGet.Config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="Optimizely feed" value="https://nuget.optimizely.com/feed/packages.svc/" />
6+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
7+
</packageSources>
8+
</configuration>

PowerSlice.sln

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.21005.1
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31702.278
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerSlice", "PowerSlice\PowerSlice.csproj", "{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerSlice", "PowerSlice\PowerSlice.csproj", "{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3A99A9FC-C2FC-4774-8827-6E340B6990E9}"
99
ProjectSection(SolutionItems) = preProject
@@ -14,6 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3A99A9
1414
EndProject
1515
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C981ACCA-4C09-4B23-A702-B05AC309746B}"
1616
EndProject
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AlloyMvcTemplates", "sample\AlloyMvcTemplates\AlloyMvcTemplates.csproj", "{03260AE9-96B1-44A0-A297-14F457B652EE}"
18+
EndProject
19+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{F1D681DC-ADBB-4E05-957F-2C825B4E3FAB}"
20+
EndProject
1721
Global
1822
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1923
Debug|Any CPU = Debug|Any CPU
@@ -24,8 +28,18 @@ Global
2428
{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
2529
{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
2630
{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{03260AE9-96B1-44A0-A297-14F457B652EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{03260AE9-96B1-44A0-A297-14F457B652EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{03260AE9-96B1-44A0-A297-14F457B652EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
34+
{03260AE9-96B1-44A0-A297-14F457B652EE}.Release|Any CPU.Build.0 = Release|Any CPU
2735
EndGlobalSection
2836
GlobalSection(SolutionProperties) = preSolution
2937
HideSolutionNode = FALSE
3038
EndGlobalSection
39+
GlobalSection(NestedProjects) = preSolution
40+
{03260AE9-96B1-44A0-A297-14F457B652EE} = {F1D681DC-ADBB-4E05-957F-2C825B4E3FAB}
41+
EndGlobalSection
42+
GlobalSection(ExtensibilityGlobals) = postSolution
43+
SolutionGuid = {A863676A-FDA2-4CE4-A877-55EC559C6B54}
44+
EndGlobalSection
3145
EndGlobal

PowerSlice/AssemblyResourceProvider.cs

Lines changed: 0 additions & 253 deletions
This file was deleted.

0 commit comments

Comments
 (0)