Skip to content

Commit

Permalink
Bump to version 1.1.0.
Browse files Browse the repository at this point in the history
Remove Nerdbank.GitVersioning.
Add net461 target support.
  • Loading branch information
amerkoleci committed Sep 5, 2019
1 parent bda5b5a commit 9fb2b8b
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 31 deletions.
44 changes: 39 additions & 5 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,49 @@ branches:
build_script:
ci-build.cmd

install:
- ps: >-
cd src
nuget restore Vortice.Mathematics.sln
$env:VORTICE_BUILD_NUMBER = ([int]$env:APPVEYOR_BUILD_NUMBER).ToString("000")
$env:VORTICE_VERSION_SUFFIX = "pre$env:VORTICE_BUILD_NUMBER"
$env:appveyor_nuget_push = 'false'
if(-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) {
if($env:appveyor_repo_tag -eq 'True') {
if($env:appveyor_repo_tag_name -match '^v[0-9]') {
$env:appveyor_nuget_push = 'true'
$env:VORTICE_VERSION_SUFFIX = ""
}
if($env:appveyor_repo_tag_name -eq 'latest') {
$env:appveyor_nuget_push = 'true'
}
}
}
build:
project: src/Vortice.Mathematics.sln
verbosity: minimal

before_package:
- cmd: msbuild /t:pack /p:VersionSuffix="%VORTICE_VERSION_SUFFIX%" /p:Configuration=Release Vortice.Mathematics/Vortice.Mathematics.csproj
- cmd: msbuild /t:pack /p:VersionSuffix="%VORTICE_VERSION_SUFFIX%" /p:Configuration=Release Vortice.Mathematics.PackedVector/Vortice.Mathematics.PackedVector.csproj

artifacts:
- path: bin\Release\Packages\*.nupkg
name: Nugets Artifacts

nuget:
project_feed: true

deploy:
- provider: NuGet
server: https://www.myget.org/F/vortice/api/v2/package
api_key:
secure: rVfu/HYGH96xeQfy+gRBC/ovHCheQKTjwIeNIE9HlpkN6e4/YtPUqn5f036pSlmi
skip_symbols: false
symbol_server: https://www.myget.org/F/vortice/api/v2/package
artifact: Nugets Artifacts
secure: 7kKL2l4dDfYB1nulVfUJYAtx43lETKMX+fMrnOwO9wljBNXanlMubrTSjgpaWnzn
on:
appveyor_nuget_push: true
artifact: Nugets Artifacts
7 changes: 2 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<OutputPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\$(Configuration)'))\$(MSBuildProjectName)</OutputPath>
<BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\obj\$(MSBuildProjectName)'))\</BaseIntermediateOutputPath>
<PackageOutputPath>$(BinDir)\$(Configuration)\Packages</PackageOutputPath>
<LangVersion>7.3</LangVersion>
<VersionPrefix>1.1.0</VersionPrefix>

<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>CS1591;CS1701</NoWarn>
Expand All @@ -23,12 +25,7 @@
<PackageProjectUrl>https://github.com/amerkoleci/Vortice.Mathematics</PackageProjectUrl>
</PropertyGroup>

<PropertyGroup>
<NerdbankGitVersioningVersion>3.0.25</NerdbankGitVersioningVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="all"/>
<PackageReference Include="Nerdbank.GitVersioning" Version="$(NerdbankGitVersioningVersion)" PrivateAssets="all" />
</ItemGroup>
</Project>
7 changes: 0 additions & 7 deletions ci-build.cmd

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>7.2</LangVersion>
<Description>High performance cross platform .NET math library</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/Vortice.Mathematics/Vortice.Mathematics.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>7.2</LangVersion>
<Description>High performance cross platform .NET math library</Description>
Expand Down
12 changes: 0 additions & 12 deletions version.json

This file was deleted.

0 comments on commit 9fb2b8b

Please sign in to comment.