Skip to content

Commit

Permalink
housekeeping: Converted to PackageReferences (#16)
Browse files Browse the repository at this point in the history
* housekeeping: Converted to PackageReferences

* Removing folder reference for msbuild

* Fixed build image number
  • Loading branch information
RLittlesII authored Oct 13, 2019
1 parent a181c4f commit 53a20e8
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 46 deletions.
4 changes: 2 additions & 2 deletions Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ function Invoke-MSBuild($solution, $customLogger)
{
if ($customLogger)
{
C:\PROGRA~2\MSBuild\14.0\Bin\amd64\msbuild "$solution" /verbosity:minimal /p:Configuration=Release /logger:"$customLogger"
msbuild "$solution" /verbosity:minimal /p:Configuration=Release /logger:"$customLogger"
}
else
{
C:\PROGRA~2\MSBuild\14.0\Bin\amd64\msbuild "$solution" /verbosity:minimal /p:Configuration=Release
msbuild "$solution" /verbosity:minimal /p:Configuration=Release
}
}

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: '{build}'
skip_tags: true
image: Visual Studio 2015
image: Visual Studio 2019
configuration: Release
install:
- ps: mkdir -Force ".\artifacts\" | Out-Null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
<FileAlignment>512</FileAlignment>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -39,10 +38,6 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\..\packages\Serilog.2.1.0\lib\netstandard1.3\Serilog.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
Expand All @@ -52,12 +47,13 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="..\Serilog.Sinks.Xamarin.nuspec">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<PackageReference Include="Serilog" Version="2.1.0" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.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.
Expand Down
15 changes: 0 additions & 15 deletions src/Serilog.Sinks.Xamarin.Droid/packages.config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,17 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\..\packages\Serilog.2.1.0\lib\netstandard1.3\Serilog.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<None Include="packages.config" />
<None Include="..\Serilog.Sinks.Xamarin.nuspec">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Serilog" Version="2.1.0" />
</ItemGroup>
</Project>
15 changes: 0 additions & 15 deletions src/Serilog.Sinks.Xamarin.iOS/packages.config

This file was deleted.

0 comments on commit 53a20e8

Please sign in to comment.