Skip to content

Commit f770027

Browse files
LakritzatorLakritzator
committedSep 5, 2022
Updated dependencies and SDK, no code changes, just to keep up to date.
1 parent ab84c84 commit f770027

File tree

17 files changed

+27
-27
lines changed

17 files changed

+27
-27
lines changed
 

‎Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<RepositoryType>git</RepositoryType>
88
<PackageProjectUrl>https://github.com/dapplo/Dapplo.Microsoft.Extensions</PackageProjectUrl>
99
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10-
<LangVersion>10</LangVersion>
10+
<LangVersion>latest</LangVersion>
1111
<DebugType>embedded</DebugType>
1212
<DebugSymbols>True</DebugSymbols>
1313
</PropertyGroup>
@@ -36,7 +36,7 @@
3636
</PropertyGroup>
3737

3838
<ItemGroup Condition="!$(MSBuildProjectName.Contains('Sample'))">
39-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255">
39+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.109">
4040
<PrivateAssets>all</PrivateAssets>
4141
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4242
</PackageReference>

‎azure-pipelines.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ stages:
3131
persistCredentials: true
3232

3333
- task: NuGetToolInstaller@0
34-
displayName: 'Use NuGet 6.1.0'
34+
displayName: 'Use NuGet 6.3.0'
3535
inputs:
36-
versionSpec: 6.1.0
36+
versionSpec: 6.3.0
3737
checkLatest: true
3838

3939
- task: UseDotNet@2
40-
displayName: 'Use .NET Core sdk 6.0'
40+
displayName: 'Use .NET Core sdk 6.0.8'
4141
inputs:
4242
packageType: sdk
43-
version: 6.0.201
43+
version: 6.0.400
4444

4545
- task: DotNetCoreCLI@2
4646
displayName: Build
@@ -128,9 +128,9 @@ stages:
128128
artifact: 'drop'
129129

130130
- task: NuGetToolInstaller@0
131-
displayName: 'Use NuGet 6.1.0'
131+
displayName: 'Use NuGet 6.3.0'
132132
inputs:
133-
versionSpec: 6.1.0
133+
versionSpec: 6.3.0
134134
checkLatest: true
135135

136136
- task: NuGetCommand@2

‎samples/Dapplo.Hosting.Sample.CaliburnMicroDemo/Dapplo.Hosting.Sample.CaliburnMicroDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
5+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<Platforms>AnyCPU;x64</Platforms>
88
<ApplicationManifest>application.manifest</ApplicationManifest>

‎samples/Dapplo.Hosting.Sample.ConsoleDemo/Dapplo.Hosting.Sample.ConsoleDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net472</TargetFrameworks>
5+
<TargetFrameworks>net6.0;netcoreapp3.1;net472</TargetFrameworks>
66
<Platforms>AnyCPU;x64</Platforms>
77
</PropertyGroup>
88

‎samples/Dapplo.Hosting.Sample.MetroDemo/Dapplo.Hosting.Sample.MetroDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
5+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<Platforms>AnyCPU;x64</Platforms>
88
<ApplicationManifest>application.manifest</ApplicationManifest>

‎samples/Dapplo.Hosting.Sample.PluginOriginalSample/Dapplo.Hosting.Sample.PluginOriginalSample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks>net6.0;netcoreapp3.1;net472</TargetFrameworks>
55
<Platforms>AnyCPU;x64</Platforms>
66
</PropertyGroup>
77

‎samples/Dapplo.Hosting.Sample.PluginWithDependency/Dapplo.Hosting.Sample.PluginWithDependency.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-windows;net5.0;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
55
<Platforms>AnyCPU;x64</Platforms>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Flurl.Http" Version="3.2.2" />
9+
<PackageReference Include="Flurl.Http" Version="3.2.4" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎samples/Dapplo.Hosting.Sample.ReactiveDemo/Dapplo.Hosting.Sample.ReactiveDemo.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
20-
<PackageReference Include="NuGet.Protocol" Version="5.7.0" />
21-
<PackageReference Include="ReactiveUI.WPF" Version="17.1.50" />
22-
<PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="14.1.45" />
20+
<PackageReference Include="NuGet.Protocol" Version="6.3.0" />
21+
<PackageReference Include="ReactiveUI.WPF" Version="18.3.1" />
22+
<PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="14.4.1" />
2323
<PackageReference Include="System.Reactive" Version="5.0.0" />
2424
</ItemGroup>
2525

‎samples/Dapplo.Hosting.Sample.WinFormsDemo/Dapplo.Hosting.Sample.WinFormsDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
5+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<UseWindowsForms>true</UseWindowsForms>
88
<Platforms>AnyCPU;x64</Platforms>

‎samples/Dapplo.Hosting.Sample.WpfDemo/Dapplo.Hosting.Sample.WpfDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
5+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<Platforms>AnyCPU;x64</Platforms>
88
<ApplicationManifest>application.manifest</ApplicationManifest>

‎src/Dapplo.Microsoft.Extensions.Hosting.AppServices/Dapplo.Microsoft.Extensions.Hosting.AppServices.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
55
<Platforms>AnyCPU;x64</Platforms>
66
<PackageDescription>This extension adds some generic application services for desktop applications.</PackageDescription>
77
</PropertyGroup>

‎src/Dapplo.Microsoft.Extensions.Hosting.CaliburnMicro/Dapplo.Microsoft.Extensions.Hosting.CaliburnMicro.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<Platforms>AnyCPU;x64</Platforms>
77
<PackageDescription>This extension adds Caliburn.Micro support to generic host based WPF applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc, together with this great MVVM framework.</PackageDescription>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Caliburn.Micro" Version="4.0.173" />
11+
<PackageReference Include="Caliburn.Micro" Version="4.0.212" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/Dapplo.Microsoft.Extensions.Hosting.Metro/Dapplo.Microsoft.Extensions.Hosting.Metro.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<Platforms>AnyCPU;x64</Platforms>
77
<PackageDescription>This extension adds MahApps.Metro support to generic host based WPF applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc, together with this UI framework for WPF.</PackageDescription>

‎src/Dapplo.Microsoft.Extensions.Hosting.Plugins/Dapplo.Microsoft.Extensions.Hosting.Plugins.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks>net6.0;netcoreapp3.1;net472</TargetFrameworks>
55
<Platforms>AnyCPU;x64</Platforms>
66
<PackageDescription>This extension adds plug-in support to generic host based applications.</PackageDescription>
77
</PropertyGroup>

‎src/Dapplo.Microsoft.Extensions.Hosting.WinForms/Dapplo.Microsoft.Extensions.Hosting.WinForms.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
55
<UseWindowsForms>true</UseWindowsForms>
66
<UseWPF>true</UseWPF>
77
<Platforms>AnyCPU;x64</Platforms>

‎src/Dapplo.Microsoft.Extensions.Hosting.Wpf/Dapplo.Microsoft.Extensions.Hosting.Wpf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<Platforms>AnyCPU;x64</Platforms>
77
<PackageDescription>This extension adds WPF support to generic host applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc.</PackageDescription>

‎templates/Dapplo.Microsoft.Extensions.Hosting.CaliburnMicro.Template/content/Dapplo.Microsoft.Extensions.Hosting.CaliburnMicro.Template.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
5+
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<ApplicationManifest>application.manifest</ApplicationManifest>
88
</PropertyGroup>

0 commit comments

Comments
 (0)