diff --git a/Bootstrappers/AutofacBootstrapper.cs b/Bootstrappers/AutofacBootstrapper.cs index d0b640f..4bddc08 100644 --- a/Bootstrappers/AutofacBootstrapper.cs +++ b/Bootstrappers/AutofacBootstrapper.cs @@ -37,6 +37,7 @@ namespace Bootstrappers ViewAssemblies = new List() { this.GetType().Assembly } }; builder.RegisterInstance(new ViewManager(viewManagerConfig)); + builder.RegisterType(); builder.RegisterInstance(this).ExternallyOwned(); builder.RegisterType().As().SingleInstance(); diff --git a/Bootstrappers/CastleWindsorBootstrapper.cs b/Bootstrappers/CastleWindsorBootstrapper.cs index 452921f..fe2a926 100644 --- a/Bootstrappers/CastleWindsorBootstrapper.cs +++ b/Bootstrappers/CastleWindsorBootstrapper.cs @@ -52,6 +52,7 @@ namespace Bootstrappers Component.For().ImplementedBy().LifestyleTransient(), // For some reason we need to register the delegate separately? Component.For>().Instance(() => new MessageBoxViewModel()), + Component.For().LifestyleTransient(), Component.For().ImplementedBy().LifestyleSingleton(), Component.For().ImplementedBy().LifestyleSingleton() ); diff --git a/Bootstrappers/NoIoCContainerBootstrapper.cs b/Bootstrappers/NoIoCContainerBootstrapper.cs index 44d19df..a39fb71 100644 --- a/Bootstrappers/NoIoCContainerBootstrapper.cs +++ b/Bootstrappers/NoIoCContainerBootstrapper.cs @@ -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()); } /// diff --git a/Bootstrappers/Tests/BootstrapperTests.cs b/Bootstrappers/Tests/BootstrapperTests.cs index 9308844..0610d2f 100644 --- a/Bootstrappers/Tests/BootstrapperTests.cs +++ b/Bootstrappers/Tests/BootstrapperTests.cs @@ -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() { diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2405e17..2cadc74 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -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 ------ diff --git a/README.md b/README.md index 6cd4e81..33d32c3 100644 --- a/README.md +++ b/README.md @@ -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 ------------ diff --git a/Rakefile b/Rakefile index 2ff2b01..f0dc92c 100644 --- a/Rakefile +++ b/Rakefile @@ -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" diff --git a/Stylet/Stylet.csproj b/Stylet/Stylet.csproj index c7ca4ae..6cb4196 100644 --- a/Stylet/Stylet.csproj +++ b/Stylet/Stylet.csproj @@ -1,14 +1,11 @@ - + Library - net45;netcoreapp3.0 + net45;netcoreapp3.0;netcoreapp3.1;net5.0-windows + false true - Stylet - Stylet - Stylet - false bin\Stylet.xml @@ -23,19 +20,20 @@ https://github.com/canton7/Stylet Antony Male A very lightweight but powerful ViewModel-First MVVM framework for WPF, inspired by Caliburn.Micro. - - true - true - - embedded - false + + + + snupkg + true + portable - - - + + + full + - + diff --git a/Stylet/Xaml/ActionBase.cs b/Stylet/Xaml/ActionBase.cs index 198c7d6..a514c45 100644 --- a/Stylet/Xaml/ActionBase.cs +++ b/Stylet/Xaml/ActionBase.cs @@ -129,12 +129,21 @@ namespace Stylet.Xaml else { var newTargetType = newTarget.GetType(); - targetMethodInfo = newTargetType.GetMethod(this.MethodName); + try + { + targetMethodInfo = newTargetType.GetMethod(this.MethodName); - if (targetMethodInfo == null) - this.logger.Warn("Unable to find method {0} on {1}", this.MethodName, newTargetType.Name); - else - this.AssertTargetMethodInfo(targetMethodInfo, newTargetType); + if (targetMethodInfo == null) + this.logger.Warn("Unable to find method {0} on {1}", this.MethodName, newTargetType.Name); + 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; diff --git a/StyletIntegrationTests/Properties/AssemblyInfo.cs b/StyletIntegrationTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 1977897..0000000 --- a/StyletIntegrationTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -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 -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the 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")] diff --git a/StyletIntegrationTests/StyletIntegrationTests.csproj b/StyletIntegrationTests/StyletIntegrationTests.csproj index 70a3174..bc6c977 100644 --- a/StyletIntegrationTests/StyletIntegrationTests.csproj +++ b/StyletIntegrationTests/StyletIntegrationTests.csproj @@ -2,14 +2,12 @@ WinExe - net45;netcoreapp3.0 + net45;netcoreapp3.1;net5.0-windows true - false - StyletIntegrationTests - StyletIntegrationTests - false + + Copyright © 2014 Antony Male diff --git a/StyletTemplates/StyletTemplates.csproj b/StyletTemplates/StyletTemplates.csproj index 4d2b5c8..f7115fc 100644 --- a/StyletTemplates/StyletTemplates.csproj +++ b/StyletTemplates/StyletTemplates.csproj @@ -1,7 +1,7 @@ - + Template - netcoreapp3.0 + net5.0-windows true true diff --git a/StyletTemplates/templates/StyletApplication-CSharp/.template.config/template.json b/StyletTemplates/templates/StyletApplication-CSharp/.template.config/template.json index 5750583..9acb051 100644 --- a/StyletTemplates/templates/StyletApplication-CSharp/.template.config/template.json +++ b/StyletTemplates/templates/StyletApplication-CSharp/.template.config/template.json @@ -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" + } + } } diff --git a/StyletTemplates/templates/StyletApplication-CSharp/App.xaml b/StyletTemplates/templates/StyletApplication-CSharp/App.xaml index bdf3bb5..91401b0 100644 --- a/StyletTemplates/templates/StyletApplication-CSharp/App.xaml +++ b/StyletTemplates/templates/StyletApplication-CSharp/App.xaml @@ -1,8 +1,8 @@ - + xmlns:local="clr-namespace:Company.StyletApplication1"> diff --git a/StyletTemplates/templates/StyletApplication-CSharp/App.xaml.cs b/StyletTemplates/templates/StyletApplication-CSharp/App.xaml.cs index ef64b7a..ef662ab 100644 --- a/StyletTemplates/templates/StyletApplication-CSharp/App.xaml.cs +++ b/StyletTemplates/templates/StyletApplication-CSharp/App.xaml.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -namespace Company.WpfApplication1 +namespace Company.StyletApplication1 { /// /// Interaction logic for App.xaml diff --git a/StyletTemplates/templates/StyletApplication-CSharp/Bootstrapper.cs b/StyletTemplates/templates/StyletApplication-CSharp/Bootstrapper.cs index 670d57d..043db7d 100644 --- a/StyletTemplates/templates/StyletApplication-CSharp/Bootstrapper.cs +++ b/StyletTemplates/templates/StyletApplication-CSharp/Bootstrapper.cs @@ -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 { diff --git a/StyletTemplates/templates/StyletApplication-CSharp/Company.StyletApplication1.csproj b/StyletTemplates/templates/StyletApplication-CSharp/Company.StyletApplication1.csproj index b8c7c64..b93cc34 100644 --- a/StyletTemplates/templates/StyletApplication-CSharp/Company.StyletApplication1.csproj +++ b/StyletTemplates/templates/StyletApplication-CSharp/Company.StyletApplication1.csproj @@ -1,14 +1,14 @@ - - - - WinExe - netcoreapp3.0 - Company.StyletApplication1 - true - - + + + + WinExe + net5.0-windows + true + + Company.StyletApplication1 + + - - - + + \ No newline at end of file diff --git a/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml b/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml index 6e4faae..f2b9c44 100644 --- a/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml +++ b/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml @@ -1,10 +1,10 @@ - diff --git a/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml.cs b/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml.cs index bf6b3ba..6aad913 100644 --- a/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml.cs +++ b/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellView.xaml.cs @@ -1,6 +1,6 @@ using System.Windows; -namespace Company.WpfApplication1.Pages +namespace Company.StyletApplication1.Pages { /// /// Interaction logic for ShellView.xaml diff --git a/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellViewModel.cs b/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellViewModel.cs index ee58c0b..c2e786e 100644 --- a/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellViewModel.cs +++ b/StyletTemplates/templates/StyletApplication-CSharp/Pages/ShellViewModel.cs @@ -1,6 +1,6 @@ using Stylet; -namespace Company.WpfApplication1.Pages +namespace Company.StyletApplication1.Pages { public class ShellViewModel : Screen { diff --git a/StyletUnitTests/Properties/AssemblyInfo.cs b/StyletUnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 64387ab..0000000 --- a/StyletUnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -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")] diff --git a/StyletUnitTests/StyletUnitTests.csproj b/StyletUnitTests/StyletUnitTests.csproj index 53b2379..a4f81e9 100644 --- a/StyletUnitTests/StyletUnitTests.csproj +++ b/StyletUnitTests/StyletUnitTests.csproj @@ -1,14 +1,16 @@ - + - netcoreapp3.0;net45 + net5.0-windows true false - false + + Copyright © 2014 Antony Male + diff --git a/global.json b/global.json deleted file mode 100644 index 99b142a..0000000 --- a/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sdk": { - "version": "3.0.100" - }, - "msbuild-sdks": { - "MSBuild.Sdk.Extras": "2.0.24" - } -} \ No newline at end of file