Skip to content

Commit

Permalink
Merge pull request #587 from Azure/merge-main-to-preview
Browse files Browse the repository at this point in the history
Merge main to preview
  • Loading branch information
amerjusupovic authored Jul 26, 2024
2 parents 42ec7d1 + 5088fe9 commit c4d103f
Show file tree
Hide file tree
Showing 55 changed files with 468 additions and 649 deletions.
39 changes: 39 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# editorconfig.org

# top-most EditorConfig file
root = true

## Default settings ##
[*]
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

## Formatting rule ##
# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0055
dotnet_diagnostic.IDE0055.severity = error

# 'Using' directive preferences
dotnet_sort_system_directives_first = false

# New line preferences
dotnet_diagnostic.IDE2002.severity = error
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
dotnet_diagnostic.IDE2004.severity = error
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false
dotnet_diagnostic.IDE2005.severity = error
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false
dotnet_diagnostic.IDE2006.severity = error
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = false
dotnet_diagnostic.IDE2000.severity = error
dotnet_style_allow_multiple_blank_lines_experimental = false
dotnet_diagnostic.IDE2003.severity = error
dotnet_style_allow_statement_immediately_after_block_experimental = false

[*.csproj]
indent_size = 2
charset = utf-8

[*.json]
indent_size = 2
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: AppConfiguration-DotnetProvider CI

on:
push:
branches:
- main
- preview
- release/*
pull_request:
branches:
- main
- preview
- release/*

permissions:
security-events: write

jobs:
build:
runs-on: windows-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install .NET
run: pwsh build/install-dotnet.ps1 -RestoreOnly

- name: Restore
run: pwsh build.ps1 -RestoreOnly

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: 'csharp'

- name: Dotnet Build
run: pwsh build.ps1

- name: Dotnet Pack
run: pwsh pack.ps1

- name: Dotnet Test
run: pwsh test.ps1

- name: Publish Test Results
uses: actions/upload-artifact@v4
with:
name: Unit Test Results
path: ${{ github.workspace }}/tests/**/*.trx

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
175 changes: 0 additions & 175 deletions .pipelines/OneBranch.Official.yml

This file was deleted.

125 changes: 0 additions & 125 deletions .pipelines/windows-buddy.yml

This file was deleted.

Loading

0 comments on commit c4d103f

Please sign in to comment.