Skip to content

Commit

Permalink
SDK updates
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveGilham committed Jun 17, 2022
1 parent fc9a283 commit 69c46a1
Show file tree
Hide file tree
Showing 33 changed files with 36 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fetch-depth: 2
- uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.300'
dotnet-version: '6.0.301'
- name: Tools
run: dotnet tool restore
- name: Setup
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.300'
dotnet-version: '6.0.301'
- name: Tools
run: dotnet tool restore
- name: Setup
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Api.Tests/AltCover.Api.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
6 changes: 3 additions & 3 deletions AltCover.Avalonia/AltCover.Avalonia.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.14" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.14" />
<PackageReference Include="Avalonia" Version="0.10.15" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand All @@ -58,7 +58,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.DotNet/AltCover.DotNet.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Engine/AltCover.Engine.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Fake/AltCover.Fake.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.PowerShell/AltCover.PowerShell.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageReference Update="FSharp.Core" Version="6.0.4" Condition="'$(TargetFramework)' != 'net20'">
<PackageReference Update="FSharp.Core" Version="6.0.5" Condition="'$(TargetFramework)' != 'net20'">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="FSharp.Core" Version="4.1.18" Condition="'$(TargetFramework)' == 'net20'" />
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Include="FSharp.Compiler.Tools" Version="10.2.3" />
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Tests/AltCover.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Toolkit/AltCover.Toolkit.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion AltCover.UICommon/AltCover.UICommon.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
3 changes: 1 addition & 2 deletions AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
<HintPath>..\ThirdParty\Unquote.dll</HintPath>
</Reference>
<PackageReference Include="nunit" Version="3.13.2" />
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down Expand Up @@ -60,7 +59,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Visualizer/AltCover.Visualizer.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion AltCover/AltCover.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion Build/NuGet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BlackFox.CommandLine" version="1.0.0" />
<PackageReference Include="NuGet.CommandLine" version="6.2.0">
<PackageReference Include="NuGet.CommandLine" version="6.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion MCS/MCS.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
<PackageReference Include="FSharp.Core" Version="6.0.4" />
<PackageReference Include="FSharp.Core" Version="6.0.5" />
<PackageReference Include="Mono.CSharp" Version="4.0.0.143" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample13/Sample13.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample17/Sample17.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample18/Sample18.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample2/Sample2.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample27/Sample27.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample30/Sample30.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample4/Sample4.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample4/Sample4LongForm.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</Target>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="6.0.4" />
<PackageReference Include="FSharp.Core" Version="6.0.5" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample6/Sample6.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/Sample7/Sample7.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<ItemGroup>
<PackageReference Update="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageReference Update="FSharp.Core" Version="6.0.4">
<PackageReference Update="FSharp.Core" Version="6.0.5">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nuget:
disable_publish_on_pr: true
install:
# SDK version fix
- cinst dotnet-sdk --version 6.0.300
- cinst dotnet-sdk --version 6.0.301
build_script:
- ps: >-
$ErrorActionPreference = 'Continue'
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.300",
"version": "6.0.301",
"rollForward": "latestMinor"
}
}

0 comments on commit 69c46a1

Please sign in to comment.