Skip to content

Commit 1cc0e7d

Browse files
authored
Merge pull request #122 from microsoft/gh-issue-102
Upgrade Behaviors to .NET 6.0
2 parents 2333807 + b8de1a1 commit 1cc0e7d

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ jobs:
1010
managed-build:
1111
runs-on: windows-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
with:
1515
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
16-
- uses: actions/setup-dotnet@v1
16+
- name: Setup .NET
17+
uses: actions/setup-dotnet@v2
1718
with:
18-
dotnet-version: 5.0.100
19+
dotnet-version: 6.0.x
1920
- uses: nuget/[email protected]
2021
- name: Restore
2122
run: nuget restore src/BehaviorsSdk.sln

Test/UnitTests/UnitTests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
22
<PropertyGroup>
3-
<TargetFrameworks>net462;netcoreapp3.1;net5.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
<UseWPF>true</UseWPF>
66
<OutputType>Library</OutputType>
@@ -9,6 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1213
<PackageReference Include="MSTest.TestAdapter">
1314
<Version>3.0.2</Version>
1415
</PackageReference>

src/Microsoft.Xaml.Behaviors/Microsoft.Xaml.Behaviors.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
22
<PropertyGroup>
3-
<TargetFrameworks>net462;netcoreapp3.1;net5.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
44
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeProjectToProjectAssets</TargetsForTfmSpecificBuildOutput>
55
<OutputType>Library</OutputType>
66
<PackageId>Microsoft.Xaml.Behaviors.Wpf</PackageId>

0 commit comments

Comments
 (0)