Skip to content

Commit

Permalink
Semver => 3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tillig committed Feb 13, 2020
1 parent ef75033 commit 2ebf216
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 64 deletions.
85 changes: 57 additions & 28 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,28 +1,57 @@
; EditorConfig to support per-solution formatting.
; Use the EditorConfig VS add-in to make this work.
; http://editorconfig.org/

; This is the default for the codeline.
root = true

[*]
end_of_line = CRLF

[*.{config,cs,xml}]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.{proj,props,sln,targets}]
indent_style = tab
trim_trailing_whitespace = true

[*.{kproj,csproj,json,ps1,psd1,psm1,resx,rst}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true

[NuGet.Config]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
; EditorConfig to support per-solution formatting.
; Use the EditorConfig VS add-in to make this work.
; http://editorconfig.org/

; This is the default for the codeline.
root = true

[*]
indent_style = space
trim_trailing_whitespace = true
insert_final_newline = true

; .NET Code - match defaults for VS
[*.{cs,csx,vb,vbx}]
indent_size = 4
charset = utf-8-bom

; .NET project files and MSBuild - match defaults for VS
[*.{csproj,nuspec,proj,projitems,props,shproj,targets,vbproj,vcxproj,vcxproj.filters,vsixmanifest,vsct}]
indent_size = 2

; .NET solution files - match defaults for VS
[*.sln]
indent_style = tab

; Config - match XML and default nuget.config template
[*.config]
indent_size = 2

; Resources - match defaults for VS
[*.resx]
indent_size = 2

; Static analysis rulesets - match defaults for VS
[*.ruleset]
indent_size = 2

; HTML, XML - match defaults for VS
[*.{cshtml,html,xml}]
indent_size = 4

; JavaScript and JS mixes - match eslint settings; JSON also matches .NET Core templates
[*.{js,json,ts,vue}]
indent_size = 2

; Markdown - match markdownlint settings
[*.{md,markdown}]
indent_size = 2

; PowerShell - match defaults for New-ModuleManifest and PSScriptAnalyzer Invoke-Formatter
[*.{ps1,psd1,psm1}]
indent_size = 4
charset = utf-8-bom

; ReStructuredText - standard indentation format from examples
[*.rst]
indent_size = 2
66 changes: 33 additions & 33 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
version: 2.2.0.{build}

configuration: Release

os: Visual Studio 2017

environment:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
NUGET_XMLDOC_MODE: skip

skip_tags: true

nuget:
disable_publish_on_pr: true

clone_depth: 1

test: off

build_script:
- ps: .\build.ps1

artifacts:
- path: artifacts\packages\**\*.nupkg
name: MyGet

deploy:
- provider: NuGet
server: https://www.myget.org/F/autofac/api/v2/package
api_key:
secure: rCUEY75fXN0wxtMy6QL4jCrLdaYbxIBzIXWeN+wEu/XDpyqimzreOc5AH5jMd5ah
skip_symbols: true
symbol_server: https://www.myget.org/F/autofac/symbols/api/v2/package
version: 3.0.0.{build}

configuration: Release

os: Visual Studio 2019

environment:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
NUGET_XMLDOC_MODE: skip

skip_tags: true

nuget:
disable_publish_on_pr: true

clone_depth: 1

test: off

build_script:
- ps: .\build.ps1

artifacts:
- path: artifacts\packages\**\*.nupkg
name: MyGet

deploy:
- provider: NuGet
server: https://www.myget.org/F/autofac/api/v2/package
api_key:
secure: rCUEY75fXN0wxtMy6QL4jCrLdaYbxIBzIXWeN+wEu/XDpyqimzreOc5AH5jMd5ah
skip_symbols: true
symbol_server: https://www.myget.org/F/autofac/symbols/api/v2/package
artifact: MyGet
1 change: 1 addition & 0 deletions build/Autofac.Build.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ function Install-DotNetCli
# Download the dotnet CLI install script
if (!(Test-Path .\dotnet\install.ps1))
{
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile ".\.dotnet\dotnet-install.ps1"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Autofac integration for Azure Service Fabric. Provides service factory implementations for Actors, Stateful Services and Stateless Services.</Description>
<VersionPrefix>2.3.0</VersionPrefix>
<VersionPrefix>3.0.0</VersionPrefix>
<TargetFrameworks>netstandard2.1;netstandard2.0;net461</TargetFrameworks>
<LangVersion>latest</LangVersion>
<PlatformTarget>x64</PlatformTarget>
Expand Down Expand Up @@ -36,7 +36,7 @@
<ItemGroup>
<None Include="..\..\build\icon.png" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="5.1.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="5.0.0" />
Expand Down Expand Up @@ -70,7 +70,7 @@
<DependentUpon>TypeExtensionsResources.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="AutofacServiceExtensionsResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand Down

0 comments on commit 2ebf216

Please sign in to comment.