From bc22e8243b5ec6231cdfd1a2956fd43066d62c0b Mon Sep 17 00:00:00 2001 From: alsami Date: Fri, 31 Jan 2020 19:15:53 +0100 Subject: [PATCH] chore: update packages and add deprecation-note --- .gitignore | 333 +++++++++--------- Autofac.Extras.MvvmCross.sln | 3 + README.md | 22 +- appveyor.yml | 68 ++-- build/icon.png | Bin 0 -> 4204 bytes global.json | 10 +- .../Autofac.Extras.MvvmCross.csproj | 26 +- .../Autofac.Extras.MvvmCross.Test.csproj | 11 +- 8 files changed, 243 insertions(+), 230 deletions(-) create mode 100644 build/icon.png 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 0000000000000000000000000000000000000000..5b612167119ef2ec48533651c54cd97cefea3d7a GIT binary patch literal 4204 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 literal 0 HcmV?d00001 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 -