Skip to content

Commit

Permalink
Updated packages, etc. to .NET Core 3.0 final
Browse files Browse the repository at this point in the history
  • Loading branch information
daveaglick committed Sep 24, 2019
1 parent f98da78 commit bb5c6d5
Show file tree
Hide file tree
Showing 29 changed files with 59 additions and 60 deletions.
1 change: 0 additions & 1 deletion Directory.Build.props
Expand Up @@ -23,7 +23,6 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<LangVersion>preview</LangVersion>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
Expand Down
1 change: 1 addition & 0 deletions RELEASE.md
@@ -1,5 +1,6 @@
# 1.0.0-alpha.4

- Updated to .NET Core 3.0 final
- Ongoing console logging improvements
- Added trigger conditions to pipelines to include always running or manually running
- Added a `-p`/`--pipeline` CLI argument to indicate which pipelines to execute
Expand Down
1 change: 0 additions & 1 deletion azure-pipelines.yml
Expand Up @@ -9,7 +9,6 @@ jobs:
- task: UseDotNet@2
inputs:
version: '3.x'
includePreviewVersions: true
- script: build -target BuildServer
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
Expand Down
8 changes: 4 additions & 4 deletions src/core/Statiq.App/Statiq.App.csproj
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview9-19423-09" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
<PackageReference Include="NetEscapades.Extensions.Logging.RollingFile" Version="2.2.0" />
<PackageReference Include="Spectre.Cli" Version="0.22.0" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/core/Statiq.Common/Statiq.Common.csproj
Expand Up @@ -5,8 +5,8 @@
<PackageTags>Statiq Static StaticContent StaticSite Blog BlogEngine</PackageTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/core/Statiq.Core/Statiq.Core.csproj
Expand Up @@ -9,10 +9,10 @@
<PackageReference Include="JavaScriptEngineSwitcher.Core" Version="3.0.0" />
<PackageReference Include="JavaScriptEngineSwitcher.Jint" Version="3.0.0" />
<PackageReference Include="JSPool" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="1.2.2" />
<PackageReference Include="Polly" Version="7.1.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0-preview9.19421.4" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
<PackageReference Include="System.Linq.Async" Version="4.0.0-preview.8.build.9" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/core/Statiq.Hosting/Statiq.Hosting.csproj
Expand Up @@ -14,9 +14,9 @@
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/core/Statiq.Testing/Statiq.Testing.csproj
Expand Up @@ -11,10 +11,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ConcurrentHashSet" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0-preview9.19421.4" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Statiq.Common\Statiq.Common.csproj" />
Expand Down
Expand Up @@ -8,7 +8,7 @@
<PackageReference Include="Buildalyzer.Workspaces" Version="2.2.0" />
<PackageReference Include="ConcurrentHashSet" Version="1.0.2" />
<PackageReference Include="System.Linq.Async" Version="4.0.0-preview.8.build.9" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.6.0-preview9.19421.4" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.6.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\core\Statiq.Common\Statiq.Common.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions src/extensions/Statiq.Razor/Statiq.Razor.csproj
Expand Up @@ -9,9 +9,9 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.1.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0-preview9.19423.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\core\Statiq.Common\Statiq.Common.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions tests/core/Statiq.App.Tests/Statiq.App.Tests.csproj
Expand Up @@ -7,9 +7,9 @@
<ProjectReference Include="..\..\..\src\core\Statiq.Testing\Statiq.Testing.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/core/Statiq.Common.Tests/Statiq.Common.Tests.csproj
Expand Up @@ -7,9 +7,9 @@
<ProjectReference Include="..\..\..\src\core\Statiq.Testing\Statiq.Testing.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/core/Statiq.Core.Tests/Statiq.Core.Tests.csproj
Expand Up @@ -8,9 +8,9 @@
<ProjectReference Include="..\..\..\src\core\Statiq.Testing\Statiq.Testing.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions tests/core/Statiq.Hosting.Tests/Statiq.Hosting.Tests.csproj
Expand Up @@ -17,10 +17,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.3" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0-preview9.19423.4" /> <!-- Required for GenerateEmbeddedFilesManifest task -->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0" /> <!-- Required for GenerateEmbeddedFilesManifest task -->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
Expand Down
Expand Up @@ -8,9 +8,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.CodeAnalysis\Statiq.CodeAnalysis.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/extensions/Statiq.Feeds.Tests/Statiq.Feeds.Tests.csproj
Expand Up @@ -8,9 +8,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Feeds\Statiq.Feeds.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
Expand Up @@ -9,9 +9,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Highlight\Statiq.Highlight.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/extensions/Statiq.Html.Tests/Statiq.Html.Tests.csproj
Expand Up @@ -8,9 +8,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Html\Statiq.Html.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
Expand Up @@ -9,9 +9,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Images\Statiq.Images.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/extensions/Statiq.Json.Tests/Statiq.Json.Tests.csproj
Expand Up @@ -8,9 +8,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Json\Statiq.Json.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/extensions/Statiq.Less.Tests/Statiq.Less.Tests.csproj
Expand Up @@ -9,9 +9,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Less\Statiq.Less.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
Expand Up @@ -8,9 +8,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Markdown\Statiq.Markdown.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
Expand Up @@ -8,9 +8,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Minification\Statiq.Minification.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/extensions/Statiq.Razor.Tests/Statiq.Razor.Tests.csproj
Expand Up @@ -9,9 +9,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Razor\Statiq.Razor.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/extensions/Statiq.Sass.Tests/Statiq.Sass.Tests.csproj
Expand Up @@ -9,9 +9,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Sass\Statiq.Sass.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
Expand Up @@ -9,9 +9,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Tables\Statiq.Tables.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/extensions/Statiq.Xmp.Tests/Statiq.Xmp.Tests.csproj
Expand Up @@ -8,9 +8,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Xmp\Statiq.Xmp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/extensions/Statiq.Yaml.Tests/Statiq.Yaml.Tests.csproj
Expand Up @@ -9,9 +9,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.Yaml\Statiq.Yaml.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>
Expand Up @@ -9,9 +9,9 @@
<ProjectReference Include="..\..\..\src\extensions\Statiq.YouTube\Statiq.YouTube.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
</ItemGroup>
</Project>

0 comments on commit bb5c6d5

Please sign in to comment.