Skip to content

Commit 54b5a2b

Browse files
authored
Merge pull request #86 from Umplify/issue_85
Adopted the release version of .NET 6.0 #85
2 parents 7f23a60 + aaff129 commit 54b5a2b

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

azure-pipeline-PR.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
displayName: 'Use .NET 6.0 sdk'
1818
inputs:
1919
packageType: sdk
20-
version: 6.0.100-rc.2.21505.57
20+
version: 6.0.100
2121
installationPath: $(Agent.ToolsDirectory)/dotnet
2222
- script: echo Started restoring the source code
2323
- task: DotNetCoreCLI@2

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ steps:
1919
displayName: 'Use .NET 6.0 sdk'
2020
inputs:
2121
packageType: sdk
22-
version: 6.0.100-rc.2.21505.57
22+
version: 6.0.100
2323
installationPath: $(Agent.ToolsDirectory)/dotnet
2424
- script: echo Started restoring the source code
2525
- task: DotNetCoreCLI@2

examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
5-
5+
<LangVersion>10.0</LangVersion>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

@@ -11,13 +11,13 @@
1111
<PackageReference Include="xunit" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
1313
<PackageReference Include="coverlet.collector" Version="3.1.0" />
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.2.21480.5" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0-rc.2.21480.5" />
16-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0-rc.2.21480.5" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0-rc.2.21480.5" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0-rc.2.21480.5" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0-rc.2.21480.5" />
20-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

src/Xunit.Microsoft.DependencyInjection.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
5+
<LangVersion>10.0</LangVersion>
56
</PropertyGroup>
67

78
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-rc.2.21480.5" />
9-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5" />
9+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
1011
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0-rc.2.21480.5" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0-rc.2.21480.5" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
1314
<PackageReference Include="xunit.core" Version="2.4.1" />
1415
</ItemGroup>
1516
<ItemGroup>

0 commit comments

Comments
 (0)