Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/simpleinjector/SimpleInje…

…ctor into v4.9.x
  • Loading branch information
dotnetjunkie committed Jan 10, 2020
2 parents 7b502c7 + 0e602f5 commit 5e3ff4b424ece59bc70947b57f3e642ded84ddfa
Showing with 21 additions and 4 deletions.
  1. +3 −3 README.md
  2. +18 −1 src/build.bat
@@ -129,11 +129,11 @@ For more information about Simple Injector please visit the following links:

* [using](https://simpleinjector.org/using) will guide you through the Simple Injector basics.
* The [Object Lifetime Management](https://simpleinjector.org/lifetimes) page explains how to configure lifestyles such as *transient*, *singleton*, and others.
* See the [Reference library](https://simpleinjector.org/ReferenceLibrary/) for the complete API documentation of the latest version.
* See the [reference library](https://simpleinjector.org/ReferenceLibrary/) for the complete API documentation of the latest version.
* See the [integration guide](https://simpleinjector.org/integration) for more information about how to integrate Simple Injector into your specific application framework.
* For more information about Dependency Injection in general, please visit [this page on Stackoverflow](https://stackoverflow.com/tags/dependency-injection/info).
* For more information about Dependency Injection in general, please visit [this page on Stack Overflow](https://stackoverflow.com/tags/dependency-injection/info).
* If you have any questions about how to use Simple Injector or about dependency injection in general, the experts at [Stackoverflow.com](https://stackoverflow.com/questions/ask?tags=simple-injector%20ioc-container%20dependency-injection%20.net%20c%23) are waiting for you.
* For all other Simple Injector related question and discussions, such as bug reports and feature requests, the [Simple Injector discussion forum](https://simpleinjector.org/forum) will be the place to start.
* The book [Dependency Injection Principles, Practices, and Patterns](https://manning.com/seemann2) presents core DI patterns in plain C# so you’ll fully understand how DI works.
* The book [Dependency Injection Principles, Practices, and Patterns](https://mng.bz/BYNl) presents core DI patterns in plain C# so you’ll fully understand how DI works.

**Happy injecting!**
@@ -31,10 +31,13 @@ IF "%version%"=="" (
set inputOk=false
)

for /f "tokens=1,2,3 delims=. " %%a in ("%version%") do set version_major=%%a&set version_minor=%%b&set version_patch=%%c

echo step: %step%
echo version: %version%
echo version: %version% (major: %version_major%, minor: %version_minor%, patch: %version_patch%)
echo prereleasePostfix: %prereleasePostfix%


IF "%inputOk%"=="false" (
rem I would have loved doing this all in one single step, but for some reason, I can't seem to build using MSBuild
rem while running from the command line using MSBuild 2017. See https://stackoverflow.com/questions/47002571/.
@@ -59,6 +62,9 @@ set version_Integration_AspNetCore=%version_Core%
set version_Integration_AspNetCore_Mvc_Core=%version_Core%
set version_Integration_AspNetCore_Mvc=%version_Core%

set referenceLibraryPath=..\..\simpleinjector-website.github.io\ReferenceLibrary
if not exist %referenceLibraryPath% goto :referenceLibraryPath_missing

set vsvars32_bat="%programfiles(x86)%\Microsoft Visual Studio\2019\Community\Common7\Tools\VsMSBuildCmd.bat"
if not exist %vsvars32_bat% goto :vsvars32_bat_missing
@call %vsvars32_bat%
@@ -201,6 +207,13 @@ IF %step%==3 (
REM For some strange reason, the following call does not compress the complete help directory, while calling it manually does work
REM %compress% "%CD%\Help" "%CD%\Releases\v%named_version%\SimpleInjector Online Documentation v%named_version%.zip"

IF "%prereleasePostfix%"=="" (
echo COPYING ONLINE DOCUMENTATION TO WEBSITE REPOSITORY

%xcopy% Help %referenceLibraryPath% /E /H /Y /I
%xcopy% Help %referenceLibraryPath%\%version_major%.%version_minor% /E /H /Y /I
)

echo Please run step 4
goto :EOF
)
@@ -399,4 +412,8 @@ GOTO :EOF

:xcopy_missing
echo Couldn't locate xcopy. Expected it to be here: %xcopy%
GOTO :EOF

:referenceLibraryPath_missing
echo The directory %cd%\%referenceLibraryPath% does not exist.
GOTO :EOF

0 comments on commit 5e3ff4b

Please sign in to comment.
You can’t perform that action at this time.