Skip to content

Commit

Permalink
Switching to dotnet sdk (#7)
Browse files Browse the repository at this point in the history
* Switching to dotnet sdk
* Updating packages
  • Loading branch information
JeffAshton authored Feb 5, 2021
1 parent 9516f8e commit 85a9d1e
Show file tree
Hide file tree
Showing 16 changed files with 112 additions and 466 deletions.
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ci-version-properties": {
"version": "0.3.1",
"commands": [
"dotnet-ci-version-properties"
]
}
}
}
36 changes: 36 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: build
on: [push]

env:
VERSION_PREFIX: "3.0.0"

jobs:
build:
runs-on: [ubuntu-latest]

steps:

- uses: Brightspace/third-party-actions@actions/checkout

- name: Setup .NET Core
uses: Brightspace/third-party-actions@actions/setup-dotnet
with:
dotnet-version: 5.0.x

- name: dotnet tool restore
run: dotnet tool restore

- name: Generate version properties
run: dotnet ci-version-properties --output VersionInfo.props && cat VersionInfo.props

- name: dotnet restore
run: dotnet restore

- name: dotnet build
run: dotnet build --configuration Release

- name: dotnet test
run: dotnet test --configuration Release --no-build

- name: dotnet pack
run: dotnet pack --configuration Release --no-build
6 changes: 0 additions & 6 deletions .nuget/NuGet.Config

This file was deleted.

100 changes: 0 additions & 100 deletions .nuget/NuGet.targets

This file was deleted.

27 changes: 27 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!--
If you edit this file edit the version in build and restart VS.
You will also need to delete .vs/ folders because of a caching bug:
https://github.com/dotnet/project-system/issues/2888
See includes/cleanup-for-vs-cache-bug.include for how this was done last time.
-->
<Project>
<Import Project="VersionInfo.props" />

<PropertyGroup>
<Deterministic>true</Deterministic>
<LangVersion>9.0</LangVersion>
<TargetFramework>netstandard2.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<PropertyGroup>
<Authors>D2L Corporation</Authors>
<Copyright>Copyright © 2021</Copyright>
<PackageProjectUrl>https://github.com/Brightspace/SimpleLogInterface</PackageProjectUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Brightspace/SimpleLogInterface</RepositoryUrl>
</PropertyGroup>

</Project>
5 changes: 5 additions & 0 deletions VersionInfo.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<Version>0.0.0-dev</Version>
</PropertyGroup>
</Project>
12 changes: 0 additions & 12 deletions appveyor.yml

This file was deleted.

36 changes: 0 additions & 36 deletions src/SimpleLogInterface.Log4Net/Properties/AssemblyInfo.cs

This file was deleted.

80 changes: 12 additions & 68 deletions src/SimpleLogInterface.Log4Net/SimpleLogInterface.Log4Net.csproj
Original file line number Diff line number Diff line change
@@ -1,68 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A214283D-36E2-485D-8FEF-E06402774761}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SimpleLogInterface.Log4Net</RootNamespace>
<AssemblyName>SimpleLogInterface.Log4Net</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<DownloadNuGetExe>true</DownloadNuGetExe>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net">
<HintPath>..\..\packages\log4net.2.0.10\lib\net45\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="Log4NetLog.cs" />
<Compile Include="Log4NetLogProvider.cs" />
<Compile Include="Log4NetLogSystem.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SimpleLogInterface\SimpleLogInterface.csproj">
<Project>{72a4823a-3b14-4ce7-9e77-fb719d781459}</Project>
<Name>SimpleLogInterface</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="SimpleLogInterface.Log4Net.nuspec" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SimpleLogInterface\SimpleLogInterface.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
</ItemGroup>
</Project>
15 changes: 0 additions & 15 deletions src/SimpleLogInterface.Log4Net/SimpleLogInterface.Log4Net.nuspec

This file was deleted.

35 changes: 0 additions & 35 deletions src/SimpleLogInterface.NUnit/Properties/AssemblyInfo.cs

This file was deleted.

Loading

0 comments on commit 85a9d1e

Please sign in to comment.