Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
hungoptimizely committed Apr 26, 2022
2 parents 8434854 + 007933c commit f255dc1
Show file tree
Hide file tree
Showing 248 changed files with 24,371 additions and 590 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Nuget client Continuous integration

on:
push:
branches:
- 'main'
- 'develop'
- 'netcore'
pull_request:
branches:
- '*'
- '!main'
jobs:
build_test_pack:
name: Build, test & pack
runs-on: windows-latest
env:
buildConfiguration: release
versionSuffix: ${{ github.ref == 'refs/heads/develop' && '-pre-' || '-ci-' }}${{github.RUN_NUMBER }}
steps:
- name: Checkout repository
uses: actions/checkout@v1
- name: Set up Node.js ⚙️
uses: actions/setup-node@v2
with:
node-version: '16'
- name: Setup .NET Core @ Latest
uses: actions/setup-dotnet@v1
with:
source-url: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Restore
run: dotnet restore PowerSlice.sln --configfile Nuget.config
- name: Build (Release version)
if: ${{ github.ref == 'refs/heads/main' }}
run: dotnet build --no-restore --configuration $env:buildConfiguration
- name: Build (Pre-Release version)
if: ${{ github.ref != 'refs/heads/main' }}
run: dotnet build --no-restore --configuration $env:buildConfiguration --version-suffix $env:versionSuffix
- name: Test
run: dotnet test --no-build --configuration $env:buildConfiguration
- name: Pack (Release version)
if: ${{ github.ref == 'refs/heads/main' }}
run: |
./build/pack.ps1
- name: Pack (Pre-Release version)
if: ${{ github.ref != 'refs/heads/main' }}
run: |
./build/pack.ps1 -versionSuffix $env:versionSuffix
- name: Publish packages
run: dotnet nuget push artifacts/**/*.nupkg --skip-duplicate -k ${{ secrets.GITHUB_TOKEN }}

10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ Desktop.ini
*.egg
*.egg-info
dist
build
eggs
parts
bin
Expand All @@ -165,4 +164,11 @@ pip-log.txt
.mr.developer.cfg

# Mac crap
.DS_Store
.DS_Store

## Ignore files generated or required by Episerver sample site
sample/AlloyMvcTemplates/App_Data/**
sample/AlloyMvcTemplates/App_Code/**
/nupkgs
/modules
/zipoutput
8 changes: 8 additions & 0 deletions NuGet.Config
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="Optimizely feed" value="https://nuget.optimizely.com/feed/packages.svc/" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
20 changes: 17 additions & 3 deletions PowerSlice.sln
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
# Visual Studio Version 16
VisualStudioVersion = 16.0.31702.278
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerSlice", "PowerSlice\PowerSlice.csproj", "{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerSlice", "PowerSlice\PowerSlice.csproj", "{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3A99A9FC-C2FC-4774-8827-6E340B6990E9}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -14,6 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3A99A9
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C981ACCA-4C09-4B23-A702-B05AC309746B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AlloyMvcTemplates", "sample\AlloyMvcTemplates\AlloyMvcTemplates.csproj", "{03260AE9-96B1-44A0-A297-14F457B652EE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{F1D681DC-ADBB-4E05-957F-2C825B4E3FAB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -24,8 +28,18 @@ Global
{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F76D9CF-1487-465F-B092-B3E4F44EF0FF}.Release|Any CPU.Build.0 = Release|Any CPU
{03260AE9-96B1-44A0-A297-14F457B652EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{03260AE9-96B1-44A0-A297-14F457B652EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03260AE9-96B1-44A0-A297-14F457B652EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03260AE9-96B1-44A0-A297-14F457B652EE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{03260AE9-96B1-44A0-A297-14F457B652EE} = {F1D681DC-ADBB-4E05-957F-2C825B4E3FAB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A863676A-FDA2-4CE4-A877-55EC559C6B54}
EndGlobalSection
EndGlobal
253 changes: 0 additions & 253 deletions PowerSlice/AssemblyResourceProvider.cs

This file was deleted.

Loading

0 comments on commit f255dc1

Please sign in to comment.