AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.3.5'

This commit is contained in:
Antony Male 2020-11-28 13:14:23 +00:00
parent bd196af55d 41cc8a3724
commit b2db34a801
23 changed files with 160 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Bootstrappers/AutofacBootstrapper.cs
View File

@ -37,6 +37,7 @@ namespace Bootstrappers
ViewAssemblies = new List<Assembly>() { this.GetType().Assembly }
};
builder.RegisterInstance<IViewManager>(new ViewManager(viewManagerConfig));
builder.RegisterType<MessageBoxView>();
builder.RegisterInstance<IWindowManagerConfig>(this).ExternallyOwned();
builder.RegisterType<WindowManager>().As<IWindowManager>().SingleInstance();

1
Bootstrappers/CastleWindsorBootstrapper.cs
View File

@ -52,6 +52,7 @@ namespace Bootstrappers
Component.For<IMessageBoxViewModel>().ImplementedBy<MessageBoxViewModel>().LifestyleTransient(),
// For some reason we need to register the delegate separately?
Component.For<Func<IMessageBoxViewModel>>().Instance(() => new MessageBoxViewModel()),
Component.For<MessageBoxView>().LifestyleTransient(),
Component.For<IWindowManager>().ImplementedBy<WindowManager>().LifestyleSingleton(),
Component.For<IEventAggregator>().ImplementedBy<EventAggregator>().LifestyleSingleton()
);

1
Bootstrappers/NoIoCContainerBootstrapper.cs
View File

@ -34,6 +34,7 @@ namespace Bootstrappers
this.Container.Add(typeof(IEventAggregator), () => eventAggregator);
this.Container.Add(typeof(IMessageBoxViewModel), () => new MessageBoxViewModel());
this.Container.Add(typeof(MessageBoxView), () => new MessageBoxView());
}
/// <summary>

16
Bootstrappers/Tests/BootstrapperTests.cs
View File

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace Bootstrappers.Tests
@ -98,6 +99,21 @@ namespace Bootstrappers.Tests
Assert.AreNotEqual(mb1, mb2);
}
[Test, Apartment(ApartmentState.STA)]
public void ReturnsMessageBoxView()
{
var view = this.bootstrapper.GetInstance(typeof(MessageBoxView));
Assert.NotNull(view);
}
[Test, Apartment(ApartmentState.STA)]
public void ReturnsTransientMessageBoxView()
{
var view1 = this.bootstrapper.GetInstance(typeof(MessageBoxView));
var view2 = this.bootstrapper.GetInstance(typeof(MessageBoxView));
Assert.AreNotEqual(view1, view2);
}
[Test]
public void ResolvesAutoSelfBoundTypesFromCallingAssemblyAsTransient()
{

7
CHANGELOG.txt
View File

@ -1,6 +1,13 @@
Stylet Changelog
================
v1.3.5
------
- Fix namespace in Stylet.Templates, and update for .NET 5
- Throw a better-worded exception if an action finds an ambiguous match
- Fix the Autofac bootstrapper (#158)
v1.3.4
------

63
README.md
View File

@ -21,7 +21,36 @@ It is inspired by [Caliburn.Micro](http://caliburnmicro.com/), and shares many o
Getting Started
---------------
### .NET Framework
### .NET 5.0+ / .NET Core
For .NET Core and .NET 5.0+ projects, the quickest way to get started is by using `dotnet new` with Stylet's template.
Open a command window where you want to create your new project, and install the Stylet templates using:
```
dotnet new -i Stylet.Templates
```
Then create a new .NET 5.0 project with:
```
dotnet new stylet -n MyStyletProject
```
(changing `MyStyletProject` as appropriate).
If you want to create a .NET Core 3.1 project, then:
```
dotnet new stylet -F netcoreapp3.1 -n MyStyletProject
```
If you want to set up your project manually, install the [Stylet](https://www.nuget.org/packages/Stylet) package, then follow the instructions in the [Quick Start](https://github.com/canton7/Stylet/wiki/Quick-Start).
Stylet requires .NET 5.0+ or .NET Core 3.0+.
### .NET Framework (<= .NET 4)
For .NET Framework projects, the quickest way to get started is to create a new "WPF Application" project, then install the NuGet package [Stylet.Start](https://www.nuget.org/packages/Stylet.Start).
This will install Stylet, and set up a simple skeleton project.
@ -32,28 +61,6 @@ If you want to set up your project manually, install the [Stylet](https://www.nu
Stylet requires .NET 4.5 (Visual Studio 2012 or higher).
### .NET Core
For .NET Core projects, the quickest way to get started is by using `dotnet new` with Stylet's template.
Open a command window where you want to create your new project, and install the Stylet templates using:
```
dotnet new -i Stylet.Templates
```
Then create a new project with:
```
dotnet new stylet -o MyStyletProject
```
(changing `MyStyletProject` as appropriate).
If you want to set up your project manually, install the [Stylet](https://www.nuget.org/packages/Stylet) package, then follow the instructions in the [Quick Start](https://github.com/canton7/Stylet/wiki/Quick-Start).
Stylet requires .NET Core 3.0.
Documentation
-------------
@ -61,16 +68,6 @@ Documentation
[The Wiki is the documentation source](https://github.com/canton7/Stylet/wiki).
There's loads of information there - go and have a look, or start with the [Quick Start](https://github.com/canton7/Stylet/wiki/Quick-Start).
Symbols
------
The source is also available when you are debugging, using [Source Link](https://github.com/dotnet/sourcelink).
Go to Debug -> Options and Settings -> General, and make the following changes:
- Turn **off** "Enable Just My Code"
- Turn **on** "Enable Source Link support"
- Turn **off** "Enable .NET Framework source stepping". Yes, it is misleading, but if you don't, then Visual Studio will ignore your custom server order and only use its own servers.
Contributing
------------

11
Rakefile
View File

@ -19,20 +19,21 @@ directory COVERAGE_DIR
desc "Build the project using the current CONFIG (or Debug)"
task :build do
sh 'dotnet', 'build', '-c', CONFIG, '-p:ContinuousIntegrationBuild=true', CSPROJ
# https://github.com/novotnyllc/MSBuildSdkExtras/pull/249
sh 'dotnet', 'build', '-c', CONFIG, CSPROJ, '/nowarn:MSB4011'
end
desc "Run unit tests using the current CONFIG (or Debug)"
task :test do
sh 'dotnet', 'test', '-c', CONFIG, UNIT_TESTS
sh 'dotnet', 'test', '-c', CONFIG, UNIT_TESTS, '/nowarn:MSB4011'
end
desc "Create NuGet package"
task :package do
# Not sure why these have to be this way around, but they do
sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, "-p:NuSpecFile=../#{NUSPEC_START}"
sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ
sh 'dotnet', 'pack', '-c', CONFIG, TEMPLATES_CSPROJ
sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, "-p:NuSpecFile=../#{NUSPEC_START}", '/nowarn:MSB4011'
sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, '-p:IncludeSymbols=true', '/nowarn:MSB4011'
sh 'dotnet', 'pack', '-c', CONFIG, TEMPLATES_CSPROJ, '/nowarn:MSB4011'
end
desc "Bump version number"

28
Stylet/Stylet.csproj
View File

@ -1,14 +1,11 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net45;netcoreapp3.0;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<UseWPF>true</UseWPF>
<RootNamespace>Stylet</RootNamespace>
<AssemblyName>Stylet</AssemblyName>
<AssemblyTitle>Stylet</AssemblyTitle>
<CodeAnalysisRuleSet />
<EnableDefaultItems>false</EnableDefaultItems>
<DocumentationFile>bin\Stylet.xml</DocumentationFile>
@ -24,18 +21,19 @@
<Authors>Antony Male</Authors>
<Description>A very lightweight but powerful ViewModel-First MVVM framework for WPF, inspired by Caliburn.Micro.</Description>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<!-- https://github.com/dotnet/sourcelink/issues/91#issuecomment-397123585 -->
<DebugType>embedded</DebugType>
<DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
<!-- Just embed all sources in the PDB: snupkg files don't support bare .cs files, and SourceLink is annoying -->
<!-- We set IncludeSymbols in the Rakefile, because we don't want it to apply to Stylet.Start -->
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedAllSources>true</EmbedAllSources>
<DebugType>portable</DebugType>
</PropertyGroup>
<ItemGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19351-01" PrivateAssets="All" />
</ItemGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
<!-- Stack traces on < net471 don't work with portable -->
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
</ItemGroup>

9
Stylet/Xaml/ActionBase.cs
View File

@ -129,6 +129,8 @@ namespace Stylet.Xaml
else
{
var newTargetType = newTarget.GetType();
try
{
targetMethodInfo = newTargetType.GetMethod(this.MethodName);
if (targetMethodInfo == null)
@ -136,6 +138,13 @@ namespace Stylet.Xaml
else
this.AssertTargetMethodInfo(targetMethodInfo, newTargetType);
}
catch (AmbiguousMatchException e)
{
var ex = new AmbiguousMatchException(String.Format("Ambiguous match for {0} method on {1}", this.MethodName, newTargetType.Name), e);
this.logger.Error(ex);
throw ex;
}
}
this.TargetMethodInfo = targetMethodInfo;

55
StyletIntegrationTests/Properties/AssemblyInfo.cs
View File

@ -1,55 +0,0 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("StyletIntegrationTests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Antony Male")]
[assembly: AssemblyProduct("StyletIntegrationTests")]
[assembly: AssemblyCopyright("Copyright © Antony Male 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//in your source files, set the <UICulture> to en-US. Then uncomment
//the NeutralResourceLanguage attribute below. Update the "en-US" in
//the line below to match the UICulture setting in the project file.
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

8
StyletIntegrationTests/StyletIntegrationTests.csproj
View File

@ -2,14 +2,12 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net45;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RootNamespace>StyletIntegrationTests</RootNamespace>
<AssemblyName>StyletIntegrationTests</AssemblyName>
<CodeAnalysisRuleSet />
<EnableDefaultItems>false</EnableDefaultItems>
<Copyright>Copyright © 2014 Antony Male</Copyright>
</PropertyGroup>
<ItemGroup>

4
StyletTemplates/StyletTemplates.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageType>Template</PackageType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>net5.0-windows</TargetFramework>
<UseWpf>true</UseWpf>
<IncludeContentInPack>true</IncludeContentInPack>

40
StyletTemplates/templates/StyletApplication-CSharp/.template.config/template.json
View File

@ -12,5 +12,43 @@
},
"sourceName": "Company.StyletApplication1",
"preferNameDirectory": true,
"defaultName": "StyletApp1"
"defaultName": "StyletApp1",
"symbols": {
"Framework": {
"type": "parameter",
"description": "The target framework for the project",
"datatype": "choice",
"choices": [
{
"choice": "net5.0-windows",
"description": "Target .NET 5.0"
},
{
"choice": "netcoreapp3.1",
"description": "Target .NET Core 3.1"
}
],
"replaces": "net5.0-windows",
"defaultValue": "net5.0-windows"
},
"SDK": {
"type": "generated",
"generator": "switch",
"parameters": {
"evaluator": "C++",
"datatype": "string",
"cases": [
{
"condition": "((Framework == 'netcoreapp3.0') || (Framework == 'netcoreapp3.1'))",
"value": "Microsoft.NET.Sdk.WindowsDesktop",
},
{
"condition": "(true)",
"value": "Microsoft.NET.Sdk"
}
]
},
"replaces": "Microsoft.NET.Sdk"
}
}
}

4
StyletTemplates/templates/StyletApplication-CSharp/App.xaml
View File

@ -1,8 +1,8 @@
<Application x:Class="Company.WpfApplication1.App"
<Application x:Class="Company.StyletApplication1.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:local="clr-namespace:Company.WpfApplication1">
xmlns:local="clr-namespace:Company.StyletApplication1">
<Application.Resources>
<s:ApplicationLoader>
<s:ApplicationLoader.Bootstrapper>

2
StyletTemplates/templates/StyletApplication-CSharp/App.xaml.cs
View File

@ -6,7 +6,7 @@ using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace Company.WpfApplication1
namespace Company.StyletApplication1
{
/// <summary>
/// Interaction logic for App.xaml

4
StyletTemplates/templates/StyletApplication-CSharp/Bootstrapper.cs
View File

@ -1,8 +1,8 @@
using Company.WpfApplication1.Pages;
using Company.StyletApplication1.Pages;
using Stylet;
using StyletIoC;
namespace Company.WpfApplication1
namespace Company.StyletApplication1
{
public class Bootstrapper : Bootstrapper<ShellViewModel>
{

10
StyletTemplates/templates/StyletApplication-CSharp/Company.StyletApplication1.csproj
View File

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace>Company.StyletApplication1</RootNamespace>
<TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<RootNamespace>Company.StyletApplication1</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Stylet" Version="0.0.0" />
<PackageReference Include="Stylet" Version="1.*" />
</ItemGroup>
</Project>

4
StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml
View File

@ -1,10 +1,10 @@
<Window x:Class="Company.WpfApplication1.Pages.ShellView"
<Window x:Class="Company.StyletApplication1.Pages.ShellView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:local="clr-namespace:Company.WpfApplication1.Pages"
xmlns:local="clr-namespace:Company.StyletApplication1.Pages"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance local:ShellViewModel}"
Title="Stylet Project" Height="450" Width="800">

2
StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml.cs
View File

@ -1,6 +1,6 @@
using System.Windows;
namespace Company.WpfApplication1.Pages
namespace Company.StyletApplication1.Pages
{
/// <summary>
/// Interaction logic for ShellView.xaml

2
StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellViewModel.cs
View File

@ -1,6 +1,6 @@
using Stylet;
namespace Company.WpfApplication1.Pages
namespace Company.StyletApplication1.Pages
{
public class ShellViewModel : Screen
{

36
StyletUnitTests/Properties/AssemblyInfo.cs
View File

@ -1,36 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("StyletUnitTests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Antony Male")]
[assembly: AssemblyProduct("StyletUnitTests")]
[assembly: AssemblyCopyright("Copyright © Antony Male 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("ffe39040-7d51-464f-9f06-9df7f0284536")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

8
StyletUnitTests/StyletUnitTests.csproj
View File

@ -1,14 +1,16 @@
<Project Sdk="MSBuild.Sdk.Extras">
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net45</TargetFrameworks>
<TargetFrameworks>net5.0-windows</TargetFrameworks>
<UseWpf>true</UseWpf>
<IsPackable>false</IsPackable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Copyright>Copyright © 2014 Antony Male</Copyright>
</PropertyGroup>
<ItemGroup>
<SupportedPlatform Include="Windows10.0" />
<PackageReference Include="Moq" Version="4.12.0" />
<PackageReference Include="nunit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />

8
global.json
View File

@ -1,8 +0,0 @@
{
"sdk": {
"version": "3.0.100"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.24"
}
}