diff --git a/.gitignore b/.gitignore index f89589b..81f9d3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,165 +1,168 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# Project specific files -artifacts/ - -# User-specific files -*.suo -*.user -*.sln.docstates -*.ide -Index.dat -Storage.dat - -# Build results -[Dd]ebug/ -[Rr]elease/ -x64/ -[Bb]in/ -[Oo]bj/ - -# Visual Studio 2015 cache/options directory -.dotnet/ -.vs/ -.vscode/ - -# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets -!packages/*/build/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* -*.TestResults.xml - -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.log -*.scc - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -*.ncrunch* -.*crunch*.local.xml - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.pubxml - -# NuGet Packages Directory -## TODO: If you have NuGet Package Restore enabled, uncomment the next line -packages/ - -# Windows Azure Build Output -csx -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -sql/ -*.Cache -ClientBin/ -[Ss]tyle[Cc]op.* -!stylecop.json -~$* -*~ -*.dbmdl -*.pfx -*.publishsettings -node_modules/ -bower_components/ -wwwroot/ -project.lock.json - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -App_Data/*.mdf -App_Data/*.ldf - -# ========================= -# Windows detritus -# ========================= - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Mac crap -.DS_Store +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# Project specific files +artifacts/ + +# User-specific files +*.suo +*.user +*.sln.docstates +*.ide +Index.dat +Storage.dat + +# Build results +[Dd]ebug/ +[Rr]elease/ +x64/ +[Bb]in/ +[Oo]bj/ + +# Visual Studio 2015 cache/options directory +.dotnet/ +.vs/ +.vscode/ + +# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets +!packages/*/build/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* +*.TestResults.xml + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.pubxml + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +!stylecop.json +~$* +*~ +*.dbmdl +*.pfx +*.publishsettings +node_modules/ +bower_components/ +wwwroot/ +project.lock.json + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +# ========================= +# Windows detritus +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store + +# JetBrains Rider +.idea diff --git a/Autofac.Extras.MvvmCross.sln b/Autofac.Extras.MvvmCross.sln index a4eb3e6..7bccb60 100644 --- a/Autofac.Extras.MvvmCross.sln +++ b/Autofac.Extras.MvvmCross.sln @@ -8,6 +8,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{86D4393C-A8B8-4C76-A456-5CD7886B670E}" ProjectSection(SolutionItems) = preProject NuGet.Config = NuGet.Config + .gitignore = .gitignore + appveyor.yml = appveyor.yml + README.md = README.md EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{50FE960F-1D6B-45BD-A294-CE850789484B}" diff --git a/README.md b/README.md index 20080ba..354f99a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -# Autofac.Extras.MvvmCross - -MvvmCross integration for [Autofac](https://autofac.org). - -[![Build status](https://ci.appveyor.com/api/projects/status/bg69gsksk4nxawso?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-mvvmcross) - -Please file issues and pull requests for this package in this repository rather than in the Autofac core repo. - -- [NuGet](https://www.nuget.org/packages/Autofac.Extras.MvvmCross) -- [Contributing](https://autofac.readthedocs.io/en/latest/contributors.html) +# Autofac.Extras.MvvmCross + +MvvmCross integration for [Autofac](https://autofac.org). + +[![Build status](https://ci.appveyor.com/api/projects/status/bg69gsksk4nxawso?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-mvvmcross) + +MAINTENANCE MODE: This package is in maintenance-only mode. Bug fixes may be addressed and Autofac compatibility may be checked but no new features will be added. + +Please file issues and pull requests for this package in this repository rather than in the Autofac core repo. + +- [NuGet](https://www.nuget.org/packages/Autofac.Extras.MvvmCross) +- [Contributing](https://autofac.readthedocs.io/en/latest/contributors.html) diff --git a/appveyor.yml b/appveyor.yml index d3a8dd0..2f5d269 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,34 +1,34 @@ -version: 5.0.0.{build} - -configuration: Release - -os: Visual Studio 2017 - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - NUGET_XMLDOC_MODE: skip - -skip_tags: true - -nuget: - disable_publish_on_pr: true - -clone_depth: 1 - -test: off - -build_script: -- ps: .\build.ps1 - -artifacts: -- path: artifacts\packages\**\*.nupkg - name: MyGet - -deploy: -- provider: NuGet - server: https://www.myget.org/F/autofac/api/v2/package - api_key: - secure: rCUEY75fXN0wxtMy6QL4jCrLdaYbxIBzIXWeN+wEu/XDpyqimzreOc5AH5jMd5ah - skip_symbols: true - symbol_server: https://www.myget.org/F/autofac/symbols/api/v2/package - artifact: MyGet +version: 5.1.0.{build} + +configuration: Release + +os: Visual Studio 2019 + +environment: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + NUGET_XMLDOC_MODE: skip + +skip_tags: true + +nuget: + disable_publish_on_pr: true + +clone_depth: 1 + +test: off + +build_script: +- ps: .\build.ps1 + +artifacts: +- path: artifacts\packages\**\*.nupkg + name: MyGet + +deploy: +- provider: NuGet + server: https://www.myget.org/F/autofac/api/v2/package + api_key: + secure: rCUEY75fXN0wxtMy6QL4jCrLdaYbxIBzIXWeN+wEu/XDpyqimzreOc5AH5jMd5ah + skip_symbols: true + symbol_server: https://www.myget.org/F/autofac/symbols/api/v2/package + artifact: MyGet diff --git a/build/icon.png b/build/icon.png new file mode 100644 index 0000000..5b61216 Binary files /dev/null and b/build/icon.png differ diff --git a/global.json b/global.json index 079ebc9..a019ed6 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ -{ - "sdk": { - "version": "2.1.401" - } -} +{ + "sdk": { + "version": "3.1.101" + } +} diff --git a/src/Autofac.Extras.MvvmCross/Autofac.Extras.MvvmCross.csproj b/src/Autofac.Extras.MvvmCross/Autofac.Extras.MvvmCross.csproj index 2599c6b..e5597fb 100644 --- a/src/Autofac.Extras.MvvmCross/Autofac.Extras.MvvmCross.csproj +++ b/src/Autofac.Extras.MvvmCross/Autofac.Extras.MvvmCross.csproj @@ -2,8 +2,8 @@ Autofac extension supporting MvvmCross dependency injection. - 5.0.0 - netstandard2.0 + 5.1.0 + netstandard2.0 $(NoWarn);CS1591 true true @@ -11,12 +11,11 @@ Autofac.Extras.MvvmCross autofac;di;ioc;dependencyinjection Release notes are at https://github.com/autofac/Autofac.Extras.MvvmCross/releases - https://cloud.githubusercontent.com/assets/1156571/13684110/16b8f152-e6bf-11e5-84ae-22c66c6d351a.png + icon.png https://autofac.org https://opensource.org/licenses/mit-license.php git https://github.com/autofac/Autofac.Extras.MvvmCross - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 false false false @@ -32,12 +31,19 @@ - - + + true + \ + + + + + + all runtime; build; native; contentfiles; analyzers - + all runtime; build; native; contentfiles; analyzers @@ -45,11 +51,11 @@ all runtime; build; native; contentfiles; analyzers - + All - - + + All diff --git a/test/Autofac.Extras.MvvmCross.Test/Autofac.Extras.MvvmCross.Test.csproj b/test/Autofac.Extras.MvvmCross.Test/Autofac.Extras.MvvmCross.Test.csproj index 43b2f07..092f40b 100644 --- a/test/Autofac.Extras.MvvmCross.Test/Autofac.Extras.MvvmCross.Test.csproj +++ b/test/Autofac.Extras.MvvmCross.Test/Autofac.Extras.MvvmCross.Test.csproj @@ -1,7 +1,7 @@ - netcoreapp2.0 + netcoreapp2.2;netcoreapp3.0;netcoreapp3.1; $(NoWarn);CS1591;SA1602;SA1611 true Autofac.Extras.MvvmCross.Test @@ -21,16 +21,15 @@ - - + + All - - + + all runtime; build; native; contentfiles; analyzers -