Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NH-3990 - Upgrade to VS2017 project structure #605

Merged
merged 1 commit into from
Aug 5, 2017
Merged

NH-3990 - Upgrade to VS2017 project structure #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions NHibernate.nunit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<NUnitProject>
<Settings activeconfig="Debug" processModel="Multiple" />
<Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\net461\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Debug\net461\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
</Config>
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\net461\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Release\net461\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
</Config>
</NUnitProject>
</NUnitProject>
14 changes: 1 addition & 13 deletions Tools/msbuild.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
@echo off
set pre=Microsoft.VisualStudio.Product.
set ids=%pre%Community %pre%Professional %pre%Enterprise %pre%BuildTools

for /f "usebackq tokens=1* delims=: " %%i in (`%~dp0\vswhere.1.0.58\tools\vswhere.exe -latest -products %ids% -requires Microsoft.Component.MSBuild`) do (
if /i "%%i"=="installationPath" set InstallDir=%%j
)

if exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
"%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" %*
) else (
exit /b -1
)
dotnet msbuild %*
1 change: 0 additions & 1 deletion Tools/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" targetFramework="net461" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
<package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net461" />
<package id="vswhere" version="1.0.58" targetFramework="net461" />
</packages>
5 changes: 1 addition & 4 deletions build-common/common-project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@
</target>

<target name="common.nuget-restore" depends="common.init common.download-nuget">
<exec basedir="${tools.dir}" workingdir="${root.dir}/src" program="NuGet.exe">
<arg value="restore" />
<arg value="NHibernate.sln" />
</exec>
<exec basedir="${tools.dir}" workingdir="${root.dir}/Tools" program="NuGet.exe">
<arg value="install" />
</exec>
Expand All @@ -70,6 +66,7 @@
<arg value="/p:Platform=&quot;Any CPU&quot;" />
<arg value="/p:Configuration=&quot;Debug&quot;" if="${build.debug == 'true'}" />
<arg value="/p:Configuration=&quot;Release&quot;" if="${build.release == 'true'}" />
<arg value="/t:Restore" />
<arg value="/t:Rebuild" />
<arg value="/v:q" />
<arg value="/m" />
Expand Down
2 changes: 1 addition & 1 deletion default.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
</copy>
<!--Required Bins for lazy loading NHibernate.ByteCode.Castle.dll-->
<!-- Tests -->
<copy file="${bin.dir}/TestEnbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/>
<copy file="${bin.dir}/TestEmbeddedConfig.cfg.xml" todir="${bin-pack.tests}"/>
<copy file="${bin.dir}/ABC.hbm.xml" todir="${bin-pack.tests}"/>
<copy todir="${bin-pack.tests}/DbScripts">
<fileset basedir="${root.dir}/src/NHibernate.Test/DbScripts">
Expand Down
Loading