mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 11:21:39 -10:00
Compare commits
218
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5f2b96b13 | ||
|
|
7dcf6e4ccf | ||
|
|
4ab90c98d3 | ||
|
|
6fdc2ecf07 | ||
|
|
50db473790 | ||
|
|
9dc2beb577 | ||
|
|
7964743ae0 | ||
|
|
60bc3cd67f | ||
|
|
51c8433b18 | ||
|
|
854a2fba5f | ||
|
|
c90c434b8d | ||
|
|
23625eff75 | ||
|
|
79d44c11f9 | ||
|
|
a4c517c504 | ||
|
|
d651e3d670 | ||
|
|
eb2bd2c1a8 | ||
|
|
1b7f975ba1 | ||
|
|
34cdab89ff | ||
|
|
f88248ee17 | ||
|
|
588046144a | ||
|
|
826060172f | ||
|
|
ef380e3712 | ||
|
|
837b034d76 | ||
|
|
a314eac67e | ||
|
|
cfa8bc07f6 | ||
|
|
ce10d3b2be | ||
|
|
74793c47ab | ||
|
|
b91712816c | ||
|
|
8e3da5fe7c | ||
|
|
ef2db766e2 | ||
|
|
8ac85a3121 | ||
|
|
a1487060c0 | ||
|
|
e9ef998703 | ||
|
|
1a679a64fc | ||
|
|
bc849e04bc | ||
|
|
ec67acc7ae | ||
|
|
65c4728162 | ||
|
|
c00a4c8003 | ||
|
|
49d81f6c73 | ||
|
|
8ea6384117 | ||
|
|
e7da0c1319 | ||
|
|
13685c2326 | ||
|
|
fa5e78a8d7 | ||
|
|
07654fb2ea | ||
|
|
510710e423 | ||
|
|
31afb2659c | ||
|
|
2175d73ac6 | ||
|
|
2fc5471e11 | ||
|
|
751ecd3e5b | ||
|
|
20cfe2e4c1 | ||
|
|
e17e4f170e | ||
|
|
4bdf5defdd | ||
|
|
331e521fdc | ||
|
|
55d49237d0 | ||
|
|
c646ba01a3 | ||
|
|
0763126f4b | ||
|
|
4e2bd09616 | ||
|
|
b91781b08f | ||
|
|
91657324d6 | ||
|
|
47e8337395 | ||
|
|
cae1f99ef8 | ||
|
|
82b6e115cc | ||
|
|
b40dd06602 | ||
|
|
94f667b1f3 | ||
|
|
281e3c0a11 | ||
|
|
e7b1d9d96e | ||
|
|
8d2cf588c9 | ||
|
|
6d3edb6643 | ||
|
|
77c316c520 | ||
|
|
848916fb2b | ||
|
|
3c4c9e5759 | ||
|
|
27d469af0d | ||
|
|
81e07b6e1a | ||
|
|
ff9d202ceb | ||
|
|
fd25cd14ca | ||
|
|
e8fa9b5229 | ||
|
|
a5ea493bdd | ||
|
|
eb71b01513 | ||
|
|
e7d2a05791 | ||
|
|
4990b4c47b | ||
|
|
b862ff8acc | ||
|
|
e71fdeef4c | ||
|
|
b8467ef0dd | ||
|
|
2d8af16663 | ||
|
|
880fb9c3eb | ||
|
|
83e2223403 | ||
|
|
f6ea703e09 | ||
|
|
ac637b0fa1 | ||
|
|
0b4533dd59 | ||
|
|
4cd6718bf6 | ||
|
|
f3ff59749f | ||
|
|
d53ed1c8f8 | ||
|
|
3ceb869495 | ||
|
|
d5fcd29868 | ||
|
|
c47a456d29 | ||
|
|
001c0d17eb | ||
|
|
5927ede215 | ||
|
|
ec8a06433f | ||
|
|
4f23050db1 | ||
|
|
c947640d2a | ||
|
|
7ce0c7c9bb | ||
|
|
f4e7da7e0c | ||
|
|
9b4e5bb49b | ||
|
|
8b43cc0761 | ||
|
|
5e9bbbc27e | ||
|
|
2ec7528ec5 | ||
|
|
23603fe1bd | ||
|
|
5d26590e79 | ||
|
|
739afc39be | ||
|
|
e91693fbb8 | ||
|
|
2656bf0cc7 | ||
|
|
37983f7fc3 | ||
|
|
5cf4cbde3a | ||
|
|
c38f5406a7 | ||
|
|
9fe0952221 | ||
|
|
2550e73081 | ||
|
|
4c9cd80099 | ||
|
|
6fe661159c | ||
|
|
d32a4bd512 | ||
|
|
690183aa08 | ||
|
|
d79c519b39 | ||
|
|
1dbe593001 | ||
|
|
4b6173d11f | ||
|
|
c9b2e3e4c2 | ||
|
|
abd5c65999 | ||
|
|
0c95513a0e | ||
|
|
e02337995e | ||
|
|
1d57482131 | ||
|
|
68dcdcaac6 | ||
|
|
132d9511ff | ||
|
|
43a734f579 | ||
|
|
03ff64f6e1 | ||
|
|
5786bd0ce9 | ||
|
|
0bab8ed6a0 | ||
|
|
c1bbee0b95 | ||
|
|
9e79098001 | ||
|
|
f30e78bcab | ||
|
|
ccaf0cc44c | ||
|
|
2f953191fc | ||
|
|
5b2d5b4bf4 | ||
|
|
87357b51e9 | ||
|
|
0b7afa989d | ||
|
|
6ee0adb342 | ||
|
|
06334e4f24 | ||
|
|
8d24d4dc74 | ||
|
|
c4929cbf9c | ||
|
|
93a5401ee0 | ||
|
|
4add6e6c44 | ||
|
|
281c3842d3 | ||
|
|
47ef0fd121 | ||
|
|
623f54afed | ||
|
|
48daad9728 | ||
|
|
b0d6f33857 | ||
|
|
59c82ade25 | ||
|
|
d0d0d29320 | ||
|
|
0b3822a9e1 | ||
|
|
2df1c787bf | ||
|
|
665a55d4f8 | ||
|
|
2984695832 | ||
|
|
762bc0bbe6 | ||
|
|
b528a79db5 | ||
|
|
220afd9d49 | ||
|
|
46c30d31f8 | ||
|
|
6bd7be2081 | ||
|
|
525c47a7f3 | ||
|
|
d6bd25591b | ||
|
|
c34def6299 | ||
|
|
6f14f86357 | ||
|
|
e9836b3511 | ||
|
|
f35b4f0996 | ||
|
|
6a415e894c | ||
|
|
9f5a54b33e | ||
|
|
cd4cb57572 | ||
|
|
3d984f7feb | ||
|
|
40e8a35f27 | ||
|
|
7b6bb72285 | ||
|
|
b093d2384f | ||
|
|
aa4768dafb | ||
|
|
3eeb285c9a | ||
|
|
4e1dca9d5e | ||
|
|
8a133f2d7e | ||
|
|
d20fb1aa2e | ||
|
|
e3e6f308fd | ||
|
|
602287a0da | ||
|
|
a81a3ce4a1 | ||
|
|
a5f6ff93ed | ||
|
|
04c5ac7f7e | ||
|
|
31b143fdc1 | ||
|
|
45d731a8bc | ||
|
|
82dbc244da | ||
|
|
e220c8f7cb | ||
|
|
d2978f3833 | ||
|
|
8408ce4b5d | ||
|
|
e3cfac464b | ||
|
|
6e9c5ab5b3 | ||
|
|
f3f1799700 | ||
|
|
0a8592dc5b | ||
|
|
674a2849b4 | ||
|
|
d8b896bb7c | ||
|
|
4249eba7f2 | ||
|
|
321bb7200c | ||
|
|
b92e728081 | ||
|
|
4751c10f9c | ||
|
|
042a9afd50 | ||
|
|
51297ed7ab | ||
|
|
2850b1274c | ||
|
|
e70880d895 | ||
|
|
bf3d9609ba | ||
|
|
757c146741 | ||
|
|
d060165941 | ||
|
|
0a77ba4b2e | ||
|
|
53c20ba829 | ||
|
|
20f782d80e | ||
|
|
6de77f9019 | ||
|
|
649d82d04d | ||
|
|
2c9c0aad5a | ||
|
|
ff322b5809 | ||
|
|
6fc5955051 |
No files matched your search
@@ -10,9 +10,6 @@
|
||||
[submodule "external/debian-snapshot"]
|
||||
path = external/debian-snapshot
|
||||
url = git://github.com/directhex/mono-snapshot.git
|
||||
[submodule "external/entityframework"]
|
||||
path = external/entityframework
|
||||
url = git://github.com/mono/entityframework.git
|
||||
[submodule "external/rx"]
|
||||
path = external/rx
|
||||
url = git://github.com/mono/rx.git
|
||||
|
||||
@@ -10,20 +10,32 @@ It is an open source implementation of Microsoft's .NET Framework based on the E
|
||||
|
||||
**Build Status**
|
||||
|
||||
| debian-amd64 | debian-i386 | debian-ppc64el | centos-s390x | windows-amd64 |
|
||||
|:-----------------------:|:----------------------:|:-------------------------:|:-----------------------:|:-------------------------:|
|
||||
| [![debian-amd64][1]][2] | [![debian-i386][3]][4] | [![debian-ppc64el][5]][6] | [![centos-s390x][7]][8] | [![windows-amd64][9]][10] |
|
||||
Officially supported architectures:
|
||||
|
||||
| debian-amd64 | debian-i386 | debian-armel | debian-armhf | windows-amd64 |
|
||||
|-------------------------|------------------------|-------------------------|-------------------------|---------------------------|
|
||||
| [![debian-amd64][1]][2] | [![debian-i386][3]][4] | [![debian-armel][5]][6] | [![debian-armhf][7]][8] | [![windows-amd64][9]][10] |
|
||||
|
||||
Community supported architectures:
|
||||
|
||||
| debian-ppc64el | centos-s390x |
|
||||
|-----------------------------|---------------------------|
|
||||
| [![debian-ppc64el][11]][12] | [![centos-s390x][13]][14] |
|
||||
|
||||
[1]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/badge/icon
|
||||
[2]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/
|
||||
[3]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/badge/icon
|
||||
[4]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/
|
||||
[5]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/badge/icon
|
||||
[6]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/
|
||||
[7]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/badge/icon
|
||||
[8]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/
|
||||
[5]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/badge/icon
|
||||
[6]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/
|
||||
[7]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/badge/icon
|
||||
[8]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/
|
||||
[9]: https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true
|
||||
[10]: https://ci.appveyor.com/project/ajlennon/mono-817/branch/master
|
||||
[11]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/badge/icon
|
||||
[12]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/
|
||||
[13]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/badge/icon
|
||||
[14]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/
|
||||
|
||||
Compilation and Installation
|
||||
============================
|
||||
|
||||
+28
-54
@@ -4,54 +4,41 @@
|
||||
# For further details see http://www.appveyor.com
|
||||
#
|
||||
|
||||
# Use 'unstable' Appveyor build worker image as Appveyor have added Cygwin to this for us
|
||||
os: Unstable
|
||||
|
||||
#
|
||||
# Custom environment variables
|
||||
#
|
||||
environment:
|
||||
global:
|
||||
CYG_ROOT: C:/cygwin
|
||||
CYG_ROOT: C:\cygwin
|
||||
CYG_MIRROR: http://cygwin.mirror.constant.com
|
||||
CYG_CACHE: C:/cygwin/var/cache/setup
|
||||
NSIS_ROOT: C:\nsis
|
||||
|
||||
CYG_CACHE: C:\cygwin\var\cache\setup
|
||||
CYG_BASH: C:\cygwin\bin\bash
|
||||
|
||||
#
|
||||
# Cache Cygwin files to speed up build
|
||||
#
|
||||
cache:
|
||||
- '%CYG_CACHE%'
|
||||
|
||||
#
|
||||
# Do a shallow clone of the repo to speed up build
|
||||
#
|
||||
clone_depth: 1
|
||||
|
||||
#
|
||||
# Initialisation prior to pulling the Mono repository
|
||||
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
|
||||
#
|
||||
init:
|
||||
- 'echo Building Mono for Windows'
|
||||
- 'echo System architecture: %PLATFORM%'
|
||||
- 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
|
||||
- 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
|
||||
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
|
||||
- 'git config --global core.autocrlf input'
|
||||
- git config --global core.autocrlf input
|
||||
|
||||
#
|
||||
# Install needed build dependencies
|
||||
#
|
||||
install:
|
||||
# NOTE: Already installed on current Appveyor unstable image
|
||||
# - 'echo Retrieving Cygwin'
|
||||
# - 'appveyor DownloadFile http://cygwin.com/setup-x86.exe -FileName %CYGROOT%/setup-x86.exe'
|
||||
- 'echo Setting up Cygwin dependencies'
|
||||
- '%CYG_ROOT%\setup-x86.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P autoconf -P automake -P bison -P gcc-core -P gcc-g++ -P mingw-runtime -P mingw-binutils -P mingw-gcc-core -P mingw-gcc-g++ -P mingw-pthreads -P mingw-w32api -P libtool -P make -P python -P gettext-devel -P gettext -P intltool -P libiconv -P pkg-config -P git -P wget -P curl > NUL'
|
||||
- 'echo Check Cygwin setup'
|
||||
- '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
|
||||
- 'echo Done setting up Cygwin'
|
||||
- 'echo Retrieving NSIS'
|
||||
- 'appveyor DownloadFile "http://sunet.dl.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe'
|
||||
- 'echo Setting up NSIS'
|
||||
- 'nsissetup.exe /S /D=%NSIS_ROOT%'
|
||||
- 'echo Done setting up NSIS'
|
||||
|
||||
#
|
||||
# NOTE: msbuild doesn't work at present so use Cygwin to build
|
||||
#
|
||||
#build:
|
||||
# project: C:\projects\mono\msvc\mono.sln
|
||||
# verbosity: detailed
|
||||
- ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
|
||||
- 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages autoconf,automake,bison,gcc-core,gcc-g++,mingw-runtime,mingw-binutils,mingw-gcc-core,mingw-gcc-g++,mingw-pthreads,mingw-w32api,libtool,make,python,gettext-devel,gettext,intltool,libiconv,pkg-config,git,curl,libxslt > NUL 2>&1'
|
||||
- '%CYG_BASH% -lc "cygcheck -dc cygwin"'
|
||||
|
||||
# Cygwin build script
|
||||
#
|
||||
@@ -59,29 +46,16 @@ install:
|
||||
#
|
||||
# The stdin/stdout file descriptor appears not to be valid for the Appveyor
|
||||
# build which causes failures as certain functions attempt to redirect
|
||||
# default file handles. Ensure a dummy file descriptor is opened with exec.
|
||||
# default file handles. Ensure a dummy file descriptor is opened with 'exec'.
|
||||
#
|
||||
build_script:
|
||||
- cmd: 'echo Cygwin root is: %CYG_ROOT%'
|
||||
- cmd: 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
|
||||
- cmd: 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
|
||||
- cmd: 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
|
||||
- cmd: 'echo Autogen running...'
|
||||
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; NOCONFIGURE=1 ./autogen.sh --prefix=/usr/local --with-preview=yes"'
|
||||
- cmd: 'echo Configure running...'
|
||||
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./configure --host=i686-pc-mingw32"'
|
||||
- cmd: 'echo Pulling monolite latest...'
|
||||
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
|
||||
- cmd: 'echo Make running...'
|
||||
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make"'
|
||||
- cmd: 'echo Installing...'
|
||||
- cmd: 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
|
||||
- cmd: '%CYG_ROOT%/bin/bash --login -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
|
||||
# - cmd: 'echo Building package...'
|
||||
# - cmd: 'cd %APPVEYOR_BUILD_FOLDER%'
|
||||
# - cmd: '%NSIS_ROOT%\makensis /DMILESTONE=%APPVEYOR_REPO_BRANCH% /DSOURCE_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER\install\*.* /DBUILDNUM=%APPVEYOR_BUILD_VERSION% monowiz.win32.nsi'
|
||||
# - cmd: 'Building distribution...'
|
||||
# - cmd: '%CYG_ROOT%/bin/bash -lc "export CYGWIN=winsymlinks:native; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make dist"'
|
||||
- 'echo Building...'
|
||||
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./autogen.sh --prefix=/usr/local --host=i686-pc-mingw32"'
|
||||
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
|
||||
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make -j2"'
|
||||
- 'echo Installing...'
|
||||
- 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
|
||||
- '%CYG_BASH% -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
|
||||
|
||||
#
|
||||
# Disable tests for now
|
||||
|
||||
+13
-5
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [3.99.0],
|
||||
AC_INIT(mono, [4.1.0],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -454,6 +454,8 @@ AC_CHECK_HEADERS(sys/user.h, [], [],
|
||||
#endif
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS(linux/serial.h)
|
||||
|
||||
AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
|
||||
if test x$have_zlib = xyes; then
|
||||
AC_TRY_COMPILE([#include <zlib.h>], [
|
||||
@@ -526,6 +528,10 @@ AC_CACHE_CHECK([for clang],
|
||||
[])
|
||||
])
|
||||
|
||||
AC_ARG_ENABLE(visiblity-hidden,
|
||||
[ --disable-visibility-hidden disable usage of -fvisiblity=hidden]
|
||||
disable_visibility_hidden=no, disable_visibility_hidden=yes)
|
||||
|
||||
WARN=''
|
||||
if test x"$GCC" = xyes; then
|
||||
WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings -Wno-switch -Wno-switch-enum -Wno-unused-value'
|
||||
@@ -540,10 +546,12 @@ if test x"$GCC" = xyes; then
|
||||
CFLAGS="$CFLAGS -fwrapv"
|
||||
|
||||
CFLAGS="$CFLAGS -DMONO_DLL_EXPORT"
|
||||
# Don't export any symbols by default
|
||||
SHARED_CFLAGS="-fvisibility=hidden"
|
||||
CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB -fvisibility=hidden"
|
||||
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
|
||||
if test x"$disable_visibility_hidden" = xno; then
|
||||
# Don't export any symbols by default
|
||||
SHARED_CFLAGS="-fvisibility=hidden"
|
||||
CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB -fvisibility=hidden"
|
||||
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
|
||||
fi
|
||||
|
||||
ORIG_CFLAGS=$CFLAGS
|
||||
# Check for the normal version, since gcc ignores unknown -Wno options
|
||||
|
||||
@@ -13,11 +13,14 @@
|
||||
<section name="startup" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
|
||||
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.diagnostics" type="System.Diagnostics.SystemDiagnosticsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
|
||||
<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
|
||||
<section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
|
||||
<sectionGroup name="system.runtime.serialization" type="System.Runtime.Serialization.Configuration.SerializationSectionGroup, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="dataContractSerializer" type="System.Runtime.Serialization.Configuration.DataContractSerializerSection, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
|
||||
</sectionGroup>
|
||||
<sectionGroup name="system.web" type="System.Web.Configuration.SystemWebSectionGroup, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<section name="anonymousIdentification" type="System.Web.Configuration.AnonymousIdentificationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
|
||||
<section name="authentication" type="System.Web.Configuration.AuthenticationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@
|
||||
#define NO_INTR(var,cmd) do { (var) = (cmd); } while ((var) == -1 && errno == EINTR)
|
||||
#define CLOSE_PIPE(p) do { close (p [0]); close (p [1]); } while (0)
|
||||
|
||||
#if defined(__APPLE__) && !defined (__arm__)
|
||||
#if defined(__APPLE__) && !defined (__arm__) && !defined (__aarch64__)
|
||||
/* Apple defines this in crt_externs.h but doesn't provide that header for
|
||||
* arm-apple-darwin9. We'll manually define the symbol on Apple as it does
|
||||
* in fact exist on all implementations (so far)
|
||||
|
||||
Vendored
-1
Submodule external/entityframework deleted from a5faddeca2.
Vendored
+1
-1
Submodule external/referencesource updated: 1becd4f88f...d99e38f17b.
@@ -78,6 +78,7 @@ static class Consts
|
||||
//
|
||||
|
||||
public const string AssemblyI18N = "I18N, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
|
||||
public const string AssemblyMicrosoft_JScript = "Microsoft.JScript, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
public const string AssemblyMicrosoft_VisualStudio_Web = "Microsoft.VisualStudio.Web, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
|
||||
@@ -9,7 +9,9 @@ static class AssemblyRef
|
||||
public const string EcmaPublicKey = "b77a5c561934e089";
|
||||
public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
|
||||
|
||||
public const string MicrosoftJScript = Consts.AssemblyMicrosoft_JScript;
|
||||
public const string MicrosoftVSDesigner = Consts.AssemblyMicrosoft_VSDesigner;
|
||||
public const string SystemData = Consts.AssemblySystem_Data;
|
||||
public const string SystemDesign = Consts.AssemblySystem_Design;
|
||||
public const string SystemDrawing = Consts.AssemblySystem_Drawing;
|
||||
public const string SystemWeb = Consts.AssemblySystem_Web;
|
||||
|
||||
@@ -40,7 +40,7 @@ class X {
|
||||
if (!Version.TryParse (field.GetValue (null) as string, out version))
|
||||
return 4;
|
||||
|
||||
if (version < new Version (3, 2))
|
||||
if (version < new Version (3, 8))
|
||||
return 5;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -166,3 +166,6 @@ $(makefrag): $(topdir)/build/executable.make $(depsdir)/.stamp
|
||||
doc-update-local:
|
||||
@:
|
||||
|
||||
# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
|
||||
gen-deps:
|
||||
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
|
||||
+17
-2
@@ -8,6 +8,18 @@
|
||||
# All the dep files now land in the same directory so we
|
||||
# munge in the library name to keep the files from clashing.
|
||||
|
||||
# The including makefile can set the following variables:
|
||||
# LIB_MCS_FLAGS - Command line flags passed to mcs.
|
||||
# LIB_REFS - This should be a space separated list of assembly names which are added to the mcs
|
||||
# command line.
|
||||
#
|
||||
|
||||
# All dependent libs become dependent dirs for parallel builds
|
||||
# Have to rename to handle differences between assembly/directory names
|
||||
DEP_LIBS=$(patsubst System.Xml,System.XML,$(LIB_REFS))
|
||||
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:%,$(LIB_REFS))
|
||||
|
||||
sourcefile = $(LIBRARY).sources
|
||||
|
||||
# If the directory contains the per profile include file, generate list file.
|
||||
@@ -68,7 +80,7 @@ endif
|
||||
|
||||
ifdef RESOURCE_STRINGS
|
||||
ifdef BOOTSTRAP_PROFILE
|
||||
MCS_FLAGS_INTERNAL += $(RESOURCE_STRINGS:%=--getresourcestrings:%)
|
||||
MCS_FLAGS_RESOURCE_STRINGS += $(RESOURCE_STRINGS:%=--getresourcestrings:%)
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -267,7 +279,7 @@ endif
|
||||
$(the_lib): $(the_libdir)/.stamp
|
||||
|
||||
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
|
||||
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
|
||||
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(MCS_FLAGS_RESOURCE_STRINGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
|
||||
$(Q) $(SN) -R $@ $(LIBRARY_SNK)
|
||||
|
||||
ifdef LIBRARY_USE_INTERMEDIATE_FILE
|
||||
@@ -345,3 +357,6 @@ $(the_libdir)/.doc-stamp: $(the_lib)
|
||||
$(MDOC_UP)
|
||||
@echo "doc-stamp" > $@
|
||||
|
||||
# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
|
||||
gen-deps:
|
||||
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
|
||||
@@ -65,7 +65,7 @@ do-profile-check: $(depsdir)/.stamp
|
||||
$(MAKE) -s do-profile-check-monolite ; \
|
||||
else \
|
||||
echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
|
||||
echo "*** You need Mono version 3.2 or better installed to build MCS" 1>&2 ; \
|
||||
echo "*** You need Mono version 3.8 or better installed to build MCS" 1>&2 ; \
|
||||
echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
|
||||
echo "*** The version of '$(BOOTSTRAP_MCS)' is: `$(BOOTSTRAP_MCS) --version`." 1>&2 ; \
|
||||
exit 1; fi; fi
|
||||
|
||||
+56
-1
@@ -28,7 +28,7 @@ ifndef BUILD_TOOLS_PROFILE
|
||||
BUILD_TOOLS_PROFILE = build
|
||||
endif
|
||||
|
||||
USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS) $(MCS_FLAGS_INTERNAL)
|
||||
USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
|
||||
USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
|
||||
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
|
||||
CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
|
||||
@@ -156,6 +156,12 @@ ifndef PROFILE_SUBDIRS
|
||||
PROFILE_SUBDIRS = $(SUBDIRS)
|
||||
endif
|
||||
|
||||
# These subdirs can be built in parallel
|
||||
PROFILE_PARALLEL_SUBDIRS := $($(PROFILE)_PARALLEL_SUBDIRS)
|
||||
ifndef PROFILE_PARALLEL_SUBDIRS
|
||||
PROFILE_PARALLEL_SUBDIRS = $(PARALLEL_SUBDIRS)
|
||||
endif
|
||||
|
||||
ifndef FRAMEWORK_VERSION_MAJOR
|
||||
FRAMEWORK_VERSION_MAJOR = $(basename $(FRAMEWORK_VERSION))
|
||||
endif
|
||||
@@ -167,8 +173,57 @@ endif
|
||||
list='$(PROFILE_SUBDIRS)'; for d in $$list ; do \
|
||||
(cd $$d && $(MAKE) $*) || { final_exit="exit 1"; $$dk; } ; \
|
||||
done; \
|
||||
if [ $* = "all" -a -n "$(PROFILE_PARALLEL_SUBDIRS)" ]; then \
|
||||
$(MAKE) do-all-parallel ENABLE_PARALLEL_SUBDIR_BUILD=1 || { final_exit="exit 1"; $$dk; } ; \
|
||||
else \
|
||||
list='$(PROFILE_PARALLEL_SUBDIRS)'; for d in $$list ; do \
|
||||
(cd $$d && $(MAKE) $*) || { final_exit="exit 1"; $$dk; } ; \
|
||||
done; \
|
||||
fi; \
|
||||
$$final_exit
|
||||
|
||||
#
|
||||
# Parallel build support
|
||||
#
|
||||
# The variable $(PROFILE)_PARALLEL_SUBDIRS should be set to the list of directories
|
||||
# which could be built in parallel. These directories are built after the directories in
|
||||
# $(PROFILE)_SUBDIRS.
|
||||
# Parallel building is currently only supported for the 'all' target.
|
||||
#
|
||||
# Each directory's Makefile may define DEP_LIBS and DEP_DIRS to specify the libraries and
|
||||
# directories it depends on.
|
||||
#
|
||||
ifneq ($(PROFILE_PARALLEL_SUBDIRS),)
|
||||
dep_dirs = .dep_dirs-$(PROFILE)
|
||||
$(dep_dirs):
|
||||
@echo "Creating $@..."
|
||||
list='$(PROFILE_PARALLEL_SUBDIRS)'; \
|
||||
echo > $@; \
|
||||
for d in $$list; do \
|
||||
$(MAKE) -C $$d gen-deps DEPS_TARGET_DIR=$$d DEPS_FILE=$(abspath $@); \
|
||||
done
|
||||
-include $(dep_dirs)
|
||||
endif
|
||||
|
||||
.PHONY: gen-deps
|
||||
# The gen-deps target is in library.make/executable.make so it can pick up
|
||||
# DEP_LIBS/DEP_DIRS
|
||||
|
||||
clean-dep-dir:
|
||||
$(RM) $(dep_dirs)
|
||||
|
||||
clean-local: clean-dep-dir
|
||||
|
||||
ifdef ENABLE_PARALLEL_SUBDIR_BUILD
|
||||
.PHONY: do-all-parallel $(PROFILE_PARALLEL_SUBDIRS)
|
||||
|
||||
do-all-parallel: $(PROFILE_PARALLEL_SUBDIRS)
|
||||
|
||||
$(PROFILE_PARALLEL_SUBDIRS):
|
||||
@set . $$MAKEFLAGS; \
|
||||
cd $@ && $(MAKE)
|
||||
endif
|
||||
|
||||
ifndef DIST_SUBDIRS
|
||||
DIST_SUBDIRS = $(SUBDIRS) $(DIST_ONLY_SUBDIRS)
|
||||
endif
|
||||
|
||||
@@ -7,7 +7,8 @@ RESOURCE_FILES = resources/relaxng.rng
|
||||
OTHER_RES = $(RESOURCE_FILES)
|
||||
|
||||
LIBRARY = Commons.Xml.Relaxng.dll
|
||||
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll \
|
||||
LIB_REFS = System System.Xml
|
||||
LIB_MCS_FLAGS = /r:$(corlib) \
|
||||
$(foreach r, $(OTHER_RES), /resource:$(r),$(notdir $(r)))
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
|
||||
EXTRA_DISTFILES = \
|
||||
|
||||
@@ -7,7 +7,8 @@ LIBRARY_NAME = ICSharpCode.SharpZipLib.dll
|
||||
LIBRARY_COMPAT = yes
|
||||
LIBRARY_SNK = SharpZipLib.key
|
||||
|
||||
LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll
|
||||
LIB_REFS = System System.Xml
|
||||
LIB_MCS_FLAGS = -r:$(corlib)
|
||||
NO_TEST = yes
|
||||
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
|
||||
|
||||
|
||||
@@ -3,7 +3,8 @@ SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = Cscompmgd.dll
|
||||
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = /r:$(corlib)
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
|
||||
LIBRARY_NAME = cscompmgd.dll
|
||||
|
||||
|
||||
@@ -3,7 +3,8 @@ SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = CustomMarshalers.dll
|
||||
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = /r:$(corlib)
|
||||
NO_TEST = yes
|
||||
|
||||
include ../../build/library.make
|
||||
@@ -1,187 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{D1081004-B9C0-4982-BA68-EB5999440ACD}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_4_5</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>EntityFramework.SqlServer</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>../ecma.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\DbGeographyAdapter.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\DbGeometryAdapter.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\DefaultSqlExecutionStrategy.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Expressions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\GlobalSuppressions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\IDbSpatialValue.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\IDbSpatialValueExtensionMethods.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Properties\AssemblyVersion.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Properties\InternalsVisibleTo.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Properties\Resources.SqlServer.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlAzureDbConfiguration.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlAzureExecutionStrategy.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlAzureRetriableExceptionDetector.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlDdlBuilder.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlExecutionStrategyResolver.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\BoolWrapper.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\DmlSqlGenerator.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\ISqlFragment.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\JoinSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\OptionalColumn.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\Sql8ConformanceChecker.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\Sql8ExpressionRewriter.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlBuilder.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlFunctionCallHandler.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlGenerator.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlSelectClauseBuilder.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlSelectStatement.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlWriter.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\Symbol.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SymbolPair.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SymbolTable.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SymbolUsageManager.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\TopClause.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlProviderManifest.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlProviderServices.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlProviderUtilities.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlSpatialDataReader.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlSpatialServices.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlSpatialServicesForConversions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlTypesAssembly.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlTypesAssemblyLoader.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlVersion.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlVersionUtils.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\Check.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\DbExpressionExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\DebugCheck.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\EdmFunctionExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\FuncExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\IDictionaryExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\MetdataItemExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\PrimitiveTypeExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\SqlDataReaderWrapper.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\TypeUsageExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\SharedAssemblyInfo.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\SharedAssemblyVersionInfo.cs" />␍ </ItemGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
|
||||
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
|
||||
<Name>corlib-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System/System-net_4_5.csproj">
|
||||
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
|
||||
<Name>System-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
|
||||
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
|
||||
<Name>System.Xml-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
|
||||
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
|
||||
<Name>System.Core-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../EntityFramework/EntityFramework-net_4_5.csproj">
|
||||
<Project>{CEE31F03-087E-4164-BBD4-990759B40C3E}</Project>
|
||||
<Name>EntityFramework-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">
|
||||
<Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>
|
||||
<Name>System.Data-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources">
|
||||
<LogicalName>System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
../../../external/entityframework/src/SharedAssemblyInfo.cs
|
||||
../../../external/entityframework/src/SharedAssemblyVersionInfo.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/DbGeographyAdapter.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/DbGeometryAdapter.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/DefaultSqlExecutionStrategy.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Expressions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/GlobalSuppressions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/IDbSpatialValue.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/IDbSpatialValueExtensionMethods.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Properties/AssemblyVersion.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Properties/InternalsVisibleTo.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Properties/Resources.SqlServer.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlAzureDbConfiguration.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlAzureExecutionStrategy.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlAzureRetriableExceptionDetector.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlDdlBuilder.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlExecutionStrategyResolver.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/BoolWrapper.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/DmlSqlGenerator.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlSpatialServicesForConversions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlTypesAssemblyLoader.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlVersionUtils.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/Check.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/SqlDataReaderWrapper.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/DbExpressionExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/DebugCheck.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/EdmFunctionExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/MetdataItemExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/FuncExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/IDictionaryExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/ISqlFragment.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/JoinSymbol.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/OptionalColumn.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/Sql8ConformanceChecker.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/Sql8ExpressionRewriter.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlBuilder.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlFunctionCallHandler.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlGenerator.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlSelectClauseBuilder.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlSelectStatement.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlWriter.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/Symbol.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SymbolPair.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SymbolTable.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SymbolUsageManager.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/TopClause.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlProviderManifest.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlProviderServices.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlProviderUtilities.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlSpatialDataReader.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlSpatialServices.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlTypesAssembly.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlVersion.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/PrimitiveTypeExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/TypeUsageExtensions.cs
|
||||
@@ -1,28 +0,0 @@
|
||||
thisdir = class/EntityFramework.SqlServer
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = EntityFramework.SqlServer.dll
|
||||
|
||||
System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources: ../../../external/entityframework/src/EntityFramework.SqlServer/Properties/Resources.SqlServer.resx
|
||||
$(RESGEN) "$<" "$@"
|
||||
|
||||
|
||||
RESOURCES = \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl
|
||||
|
||||
|
||||
LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Core.dll -r:EntityFramework.dll -r:System.Data.dll \
|
||||
-keyfile:../ecma.pub -delaysign -warn:1 \
|
||||
-resource:System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources \
|
||||
$(RESOURCES:%=-resource:%)
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
$(the_lib): System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources
|
||||
@@ -1 +0,0 @@
|
||||
System.Data.Resources.EntityStoreSchemaGenerator.xsd
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -1,50 +0,0 @@
|
||||
thisdir = class/EntityFramework
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = EntityFramework.dll
|
||||
|
||||
System.Data.Entity.Properties.Resources.resources: ../../../external/entityframework/src/EntityFramework/Properties/Resources.resx
|
||||
$(RESGEN) "$<" "$@"
|
||||
|
||||
System.Data.Entity.Properties.Resources.Migrate.resources: ../../../external/entityframework/src/EntityFramework/Properties/Resources.Migrate.resx
|
||||
$(RESGEN) "$<" "$@"
|
||||
|
||||
System.Data.Entity.Properties.Resources.PowerShell.resources: ../../../external/entityframework/src/EntityFramework/Properties/Resources.PowerShell.resx
|
||||
$(RESGEN) "$<" "$@"
|
||||
|
||||
RESOURCES = ../../../external/entityframework/src/EntityFramework/Resources/System/Data/System.Data.Resources.DbProviderServices.ConceptualSchemaDefinition.csdl \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/System.Data.Resources.DbProviderServices.ConceptualSchemaDefinitionVersion3.csdl \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/System.Data.Resources.ProviderServices.ProviderManifest.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.AnnotationSchema.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CodeGenerationSchema.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_1.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_1_1.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_2.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_3.xsd \
|
||||
System.Data.Resources.EntityStoreSchemaGenerator.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.SSDLSchema.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.SSDLSchema_2.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.SSDLSchema_3.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_1.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_2.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_3.xsd
|
||||
|
||||
LIB_MCS_FLAGS = -r:System.Data.dll -r:System.Transactions.dll -r:System.Xml.Linq.dll -r:System.Configuration.dll -r:System.ComponentModel.DataAnnotations.dll -r:System.Runtime.Serialization.dll \
|
||||
-r:System.dll -r:System.Xml.dll -r:System.Core.dll -r:Microsoft.CSharp.dll -keyfile:../ecma.pub -delaysign -warn:1 \
|
||||
-resource:System.Data.Entity.Properties.Resources.resources \
|
||||
-resource:System.Data.Entity.Properties.Resources.Migrate.resources \
|
||||
-resource:System.Data.Entity.Properties.Resources.PowerShell.resources \
|
||||
$(RESOURCES:%=-resource:%)
|
||||
|
||||
CLEAN_FILES = System.Data.Resources.EntityStoreSchemaGenerator.xsd
|
||||
|
||||
System.Data.Resources.EntityStoreSchemaGenerator.xsd:
|
||||
cp ../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/system.data.resources.entitystoreschemagenerator.xsd System.Data.Resources.EntityStoreSchemaGenerator.xsd
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
$(the_lib): System.Data.Resources.EntityStoreSchemaGenerator.xsd \
|
||||
System.Data.Entity.Properties.Resources.resources \
|
||||
System.Data.Entity.Properties.Resources.Migrate.resources \
|
||||
System.Data.Entity.Properties.Resources.PowerShell.resources
|
||||
@@ -51,4 +51,4 @@ doc-update-local:
|
||||
@echo "not doing docs"
|
||||
|
||||
doc-update-recursive:
|
||||
@echo "do not recurse the Facades folder"
|
||||
@echo "do not recurse the Facades folder"
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Collections.Concurrent.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Collections.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
|
||||
LIB_REFS = System System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.ComponentModel.Annotations.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ComponentModel.DataAnnotations
|
||||
LIB_REFS = System.ComponentModel.DataAnnotations
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.ComponentModel.EventBasedAsync.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.ComponentModel.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Diagnostics.Debug.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Diagnostics.Tools.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Dynamic.Runtime.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core /r:System
|
||||
LIB_REFS = System.Core System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.IO.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Linq.Expressions.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
|
||||
LIB_REFS = System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Linq.Parallel.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
|
||||
LIB_REFS = System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Linq.Queryable.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
|
||||
LIB_REFS = System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Linq.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
|
||||
LIB_REFS = System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Net.NetworkInformation.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Net.Primitives.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Net.Requests.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.ObjectModel.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Extensions.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.InteropServices.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
|
||||
LIB_REFS = System System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Numerics.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Numerics
|
||||
LIB_REFS = System.Numerics
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Serialization.Json.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization
|
||||
LIB_REFS = System.Runtime.Serialization
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Serialization.Primitives.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization
|
||||
LIB_REFS = System.Runtime.Serialization
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Serialization.Xml.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization /r:System.Xml
|
||||
LIB_REFS = System.Runtime.Serialization System.Xml
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.ComponentModel.Composition /r:System.Core
|
||||
LIB_REFS = System System.ComponentModel.Composition System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.ServiceModel.Http.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel
|
||||
LIB_REFS = System.ServiceModel
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.ServiceModel.Primitives.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel /r:System.Xml
|
||||
LIB_REFS = System.ServiceModel System.Xml
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -20,10 +20,6 @@
|
||||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
#if !MONOTOUCH
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.CompressionFormat))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.ClientOperation))]
|
||||
#endif
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ActionNotSupportedException))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ChannelFactory))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ChannelFactory<>))]
|
||||
@@ -44,6 +40,7 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.ChannelManagerBase))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.ChannelParameterCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.CommunicationObject))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.CompressionFormat))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.CustomBinding))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.FaultConverter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.IChannel))]
|
||||
@@ -105,6 +102,7 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.OperationDescription))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.OperationDescriptionCollection))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.ServiceEndpoint))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.ClientOperation))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.ClientRuntime))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.DispatchOperation))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.DispatchRuntime))]
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.ServiceModel.Security.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel
|
||||
LIB_REFS = System.ServiceModel
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Text.RegularExpressions.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Threading.Tasks.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
|
||||
LIB_REFS = System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Threading.Timer.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
|
||||
LIB_REFS = System System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Threading.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
|
||||
LIB_REFS = System System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Xml.ReaderWriter.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml
|
||||
LIB_REFS = System.Xml
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Xml.XDocument.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml.Linq /r:System.Xml
|
||||
LIB_REFS = System.Xml.Linq System.Xml
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -11,7 +11,8 @@ LIBRARY = System.Xml.XmlSerializer.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml
|
||||
LIB_REFS = System.Xml
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = IBM.Data.DB2.dll
|
||||
LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll \
|
||||
/r:System.Xml.dll /r:System.Data.dll -warn:1
|
||||
LIB_REFS = System System.Xml System.Data
|
||||
LIB_MCS_FLAGS = /unsafe /r:$(corlib) -warn:1
|
||||
NO_TEST = yes
|
||||
|
||||
EXTRA_DISTFILES = ibm.pub
|
||||
|
||||
@@ -5,7 +5,8 @@ include ../../build/rules.make
|
||||
LIBRARY = ICSharpCode.SharpZipLib.dll
|
||||
LIBRARY_SNK = SharpZipLib.key
|
||||
|
||||
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll -warn:1
|
||||
LIB_REFS = System System.Xml
|
||||
LIB_MCS_FLAGS = /r:$(corlib) -warn:1
|
||||
NO_TEST = yes
|
||||
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
|
||||
|
||||
|
||||
@@ -46,4 +46,4 @@
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -109,4 +109,4 @@
|
||||
<UserProperties REFS-JarPath-mainsoft-web="..\bin\Debug_Java20\Mainsoft.Web.jar" REFS-JarPath-nunit-framework="..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-system-web="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Web.jar" REFS-JarPath-system-configuration="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Configuration.jar" REFS-JarPath-rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Xml.jar" REFS-JarPath-system-data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Data.jar" REFS-JarPath-system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.jar" REFS-JarPath-mscorlib="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\mscorlib.jar" />
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
</Project>
|
||||
</Project>
|
||||
+54
-49
@@ -26,8 +26,8 @@ mobile_common_dirs := \
|
||||
Mono.Security \
|
||||
System \
|
||||
I18N \
|
||||
System.Xml.Linq \
|
||||
System.Runtime.Serialization \
|
||||
System.Xml.Linq \
|
||||
System.ServiceModel \
|
||||
System.ServiceModel.Web \
|
||||
System.Json \
|
||||
@@ -84,8 +84,7 @@ net_4_5_dirs := \
|
||||
System.Core \
|
||||
Mono.Security \
|
||||
System.Security \
|
||||
System.Configuration \
|
||||
I18N \
|
||||
System.Configuration \
|
||||
$(resgen_dir) \
|
||||
System.Drawing \
|
||||
System.Transactions \
|
||||
@@ -96,7 +95,7 @@ net_4_5_dirs := \
|
||||
Accessibility \
|
||||
Mono.WebBrowser \
|
||||
System.Runtime.Serialization.Formatters.Soap \
|
||||
Managed.Windows.Forms \
|
||||
System.Windows.Forms \
|
||||
Mono.Data.Sqlite \
|
||||
System.Web.ApplicationServices \
|
||||
System.Web \
|
||||
@@ -105,34 +104,20 @@ net_4_5_dirs := \
|
||||
System.Configuration.Install \
|
||||
System.Management \
|
||||
System.Data.OracleClient \
|
||||
Microsoft.VisualC \
|
||||
Cscompmgd \
|
||||
PEAPI \
|
||||
Npgsql \
|
||||
Commons.Xml.Relaxng \
|
||||
Novell.Directory.Ldap \
|
||||
Mono.Security.Win32 \
|
||||
System.DirectoryServices \
|
||||
System.DirectoryServices.Protocols \
|
||||
RabbitMQ.Client \
|
||||
Mono.Messaging \
|
||||
System.Messaging \
|
||||
Mono.Messaging.RabbitMQ \
|
||||
System.ServiceProcess \
|
||||
System.Drawing.Design \
|
||||
System.Design \
|
||||
ICSharpCode.SharpZipLib \
|
||||
Mono.Http \
|
||||
Mono.Cairo \
|
||||
IBM.Data.DB2 \
|
||||
CustomMarshalers \
|
||||
Mono.Cecil \
|
||||
Mono.Cecil.Mdb \
|
||||
Mono.Debugger.Soft \
|
||||
SystemWebTestShim \
|
||||
System.Xml.Linq \
|
||||
System.ServiceModel.Internals \
|
||||
System.Runtime.Serialization \
|
||||
System.Data.DataSetExtensions \
|
||||
System.Xml.Linq \
|
||||
System.Data.Linq \
|
||||
System.Web.Abstractions \
|
||||
System.Web.Routing \
|
||||
@@ -142,18 +127,10 @@ net_4_5_dirs := \
|
||||
System.Web.Extensions \
|
||||
System.Web.Extensions.Design \
|
||||
System.Web.DynamicData \
|
||||
Mono.C5 \
|
||||
Mono.Management \
|
||||
Mono.Options \
|
||||
Mono.Simd \
|
||||
Mono.Tasklets \
|
||||
System.Dynamic \
|
||||
Mono.CSharp \
|
||||
System.Net \
|
||||
System.Json \
|
||||
System.Numerics \
|
||||
Microsoft.CSharp \
|
||||
System.Windows.Forms.DataVisualization \
|
||||
System.Xaml \
|
||||
WindowsBase \
|
||||
System.ServiceModel.Activation \
|
||||
@@ -161,7 +138,41 @@ net_4_5_dirs := \
|
||||
System.ServiceModel.Discovery \
|
||||
System.Runtime.Caching \
|
||||
System.Runtime.DurableInstancing \
|
||||
Microsoft.Web.Infrastructure \
|
||||
System.ServiceModel.Web \
|
||||
System.Net.Http \
|
||||
System.Net.Http.WebRequest \
|
||||
System.Web.Razor \
|
||||
System.Web.WebPages.Deployment \
|
||||
System.Web.WebPages \
|
||||
System.Web.WebPages.Razor \
|
||||
System.Web.Mvc3 \
|
||||
System.Net.Http.Formatting \
|
||||
System.Web.Http \
|
||||
System.Web.Http.SelfHost \
|
||||
System.Web.Http.WebHost
|
||||
|
||||
# These are the subdirs which depends on libs in net_4_5_dirs
|
||||
# or have proper dependencies between each other
|
||||
net_4_5_parallel_dirs := \
|
||||
PEAPI \
|
||||
I18N \
|
||||
Mono.Http \
|
||||
Mono.Cairo \
|
||||
Mono.Cecil \
|
||||
Mono.Cecil.Mdb \
|
||||
Mono.Debugger.Soft \
|
||||
Mono.C5 \
|
||||
Mono.Management \
|
||||
Mono.Options \
|
||||
Mono.Simd \
|
||||
Mono.Tasklets \
|
||||
Mono.CodeContracts \
|
||||
Mono.Parallel \
|
||||
Mono.Security.Win32 \
|
||||
Mono.Messaging.RabbitMQ \
|
||||
System.Dynamic \
|
||||
System.Windows.Forms.DataVisualization \
|
||||
System.Reactive.Interfaces \
|
||||
System.Reactive.Core \
|
||||
System.Reactive.Linq \
|
||||
@@ -173,34 +184,25 @@ net_4_5_dirs := \
|
||||
System.Reactive.Observable.Aliases \
|
||||
System.Reactive.Experimental \
|
||||
System.Reactive.Debugger \
|
||||
Microsoft.Web.Infrastructure \
|
||||
WebMatrix.Data \
|
||||
System.ServiceModel.Web \
|
||||
System.Data.Services.Client \
|
||||
System.Data.Services \
|
||||
System.Json.Microsoft \
|
||||
System.Data.Entity \
|
||||
monodoc \
|
||||
System.Data.DataSetExtensions \
|
||||
System.Json.Microsoft \
|
||||
System.Threading.Tasks.Dataflow \
|
||||
System.ComponentModel.Composition.4.5 \
|
||||
System.Net.Http \
|
||||
System.Net.Http.WebRequest \
|
||||
System.Web.Razor \
|
||||
System.Web.WebPages.Deployment \
|
||||
System.Web.WebPages \
|
||||
System.Web.WebPages.Razor \
|
||||
System.Web.Mvc3 \
|
||||
System.Net.Http.Formatting \
|
||||
System.Web.Http \
|
||||
System.Web.Http.SelfHost \
|
||||
System.Web.Http.WebHost \
|
||||
EntityFramework \
|
||||
EntityFramework.SqlServer \
|
||||
Mono.CodeContracts \
|
||||
System.IO.Compression \
|
||||
System.IO.Compression.FileSystem \
|
||||
System.Windows \
|
||||
System.Xml.Serialization \
|
||||
System.Numerics \
|
||||
Novell.Directory.Ldap \
|
||||
System.DirectoryServices \
|
||||
System.DirectoryServices.Protocols \
|
||||
RabbitMQ.Client \
|
||||
Microsoft.VisualC \
|
||||
WebMatrix.Data \
|
||||
monodoc \
|
||||
$(pcl_facade_dirs)
|
||||
|
||||
xbuild_2_0_dirs := \
|
||||
@@ -221,13 +223,14 @@ mobile_static_SUBDIRS := $(mobile_static_dirs)
|
||||
mobile_SUBDIRS := $(mobile_dynamic_dirs)
|
||||
xammac_SUBDIRS := $(xammac_dirs)
|
||||
net_4_0_SUBDIRS := reference-assemblies
|
||||
net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
|
||||
net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs)
|
||||
net_4_5_PARALLEL_SUBDIRS := $(net_4_5_parallel_dirs) aot-compiler
|
||||
xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
|
||||
xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)
|
||||
|
||||
include ../build/rules.make
|
||||
|
||||
SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs)
|
||||
SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs) $(net_4_5_parallel_dirs)
|
||||
|
||||
DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs)
|
||||
|
||||
@@ -275,3 +278,5 @@ dist-local: dist-default
|
||||
|
||||
csproj-local:
|
||||
|
||||
clean-local:
|
||||
$(RM) -rf $(topdir)/class/lib/$(PROFILE)
|
||||
@@ -7,6 +7,7 @@ include $(XBUILD_DIR)/xbuild.make
|
||||
|
||||
LIBRARY = Microsoft.Build.Engine.dll
|
||||
|
||||
LIB_REFS = System System.Core System.Xml
|
||||
LIB_MCS_FLAGS = \
|
||||
/r:$(corlib) \
|
||||
/r:System.dll \
|
||||
|
||||
@@ -472,7 +472,7 @@ namespace Microsoft.Build.BuildEngine {
|
||||
|
||||
BuildItemGroup big;
|
||||
BuildItem bi = new BuildItem (this);
|
||||
bi.finalItemSpec = taskitem.ItemSpec;
|
||||
bi.finalItemSpec = ((ITaskItem2)taskitem).EvaluatedIncludeEscaped;
|
||||
|
||||
foreach (DictionaryEntry de in taskitem.CloneCustomMetadata ()) {
|
||||
bi.unevaluatedMetadata.Add ((string) de.Key, (string) de.Value);
|
||||
|
||||
@@ -156,7 +156,7 @@ namespace Microsoft.Build.BuildEngine {
|
||||
for (int i = 0; i < lists.Count; i++) {
|
||||
foreach (object o in lists [i]) {
|
||||
if (o is string)
|
||||
expressionCollection.Add (MSBuildUtils.Unescape ((string) o));
|
||||
expressionCollection.Add ((string) o);
|
||||
else if (!allowItems && o is ItemReference)
|
||||
expressionCollection.Add (((ItemReference) o).OriginalString);
|
||||
else if (!allowMd && o is MetadataReference) {
|
||||
|
||||
+2
-2
@@ -233,11 +233,11 @@ namespace Microsoft.Build.BuildEngine {
|
||||
// Trim and Remove empty items
|
||||
List<ITaskItem> toRemove = new List<ITaskItem> ();
|
||||
for (int i = 0; i < finalItems.Count; i ++) {
|
||||
string s = finalItems [i].ItemSpec.Trim ();
|
||||
string s = ((ITaskItem2)finalItems [i]).EvaluatedIncludeEscaped.Trim ();
|
||||
if (s.Length == 0)
|
||||
toRemove.Add (finalItems [i]);
|
||||
else
|
||||
finalItems [i].ItemSpec = s;
|
||||
((ITaskItem2)finalItems [i]).EvaluatedIncludeEscaped = s;
|
||||
}
|
||||
foreach (ITaskItem ti in toRemove)
|
||||
finalItems.Remove (ti);
|
||||
|
||||
@@ -152,6 +152,15 @@ namespace Microsoft.Build.BuildEngine {
|
||||
project_attribute.IndexOf ("$(MSBuildExtensionsPath32)") >= 0 ||
|
||||
project_attribute.IndexOf ("$(MSBuildExtensionsPath64)") >= 0;
|
||||
|
||||
bool condn_has_extn_ref = condition_attribute.IndexOf ("$(MSBuildExtensionsPath)") >= 0 ||
|
||||
condition_attribute.IndexOf ("$(MSBuildExtensionsPath32)") >= 0 ||
|
||||
condition_attribute.IndexOf ("$(MSBuildExtensionsPath64)") >= 0;
|
||||
|
||||
// we can skip the following logic in case the condition doesn't reference any extension paths
|
||||
// and it evaluates to false since nothing would change anyway
|
||||
if (!condn_has_extn_ref && !ConditionParser.ParseAndEvaluate (condition_attribute, project))
|
||||
return;
|
||||
|
||||
string importingFile = importingProject != null ? importingProject.FullFileName : project.FullFileName;
|
||||
DirectoryInfo base_dir_info = null;
|
||||
if (!String.IsNullOrEmpty (importingFile))
|
||||
|
||||
+1
-1
@@ -105,7 +105,7 @@ namespace Microsoft.Build.BuildEngine
|
||||
object value;
|
||||
try {
|
||||
value = type.InvokeMember (member_name, flags, null, target, args, CultureInfo.InvariantCulture);
|
||||
} catch (MissingFieldException) {
|
||||
} catch (MissingMethodException) {
|
||||
//
|
||||
// It can be field/constant instead of a property
|
||||
//
|
||||
|
||||
+12
-1
@@ -150,7 +150,18 @@ namespace Microsoft.Build.BuildEngine
|
||||
|
||||
public static string MakeRelative (string basePath, string path)
|
||||
{
|
||||
throw new NotImplementedException ("MakeRelative");
|
||||
if (String.IsNullOrEmpty (basePath))
|
||||
return path;
|
||||
|
||||
// ensure trailing slash for basePath
|
||||
if (basePath [basePath.Length - 1] != '\\' && basePath [basePath.Length - 1] != '/')
|
||||
basePath += '/';
|
||||
|
||||
var uriBasePath = new Uri (basePath, UriKind.Absolute);
|
||||
var uriPath = new Uri (path);
|
||||
|
||||
var uriRelative = uriBasePath.MakeRelativeUri (uriPath);
|
||||
return Uri.UnescapeDataString (uriRelative.ToString ()).Replace ('/', '\\'); // msbuild uses backslash paths everywhere
|
||||
}
|
||||
|
||||
public static string ValueOrDefault (string value, string defaultValue)
|
||||
|
||||
@@ -19,12 +19,13 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -32,7 +33,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -98,7 +99,9 @@
|
||||
<Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\MemberInvocationReference.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\PredefinedPropertyFunctions.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
|
||||
@@ -109,6 +112,7 @@
|
||||
<Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\TaskExecutionMode.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
|
||||
<Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
|
||||
@@ -126,9 +130,13 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
@@ -137,29 +145,29 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
|
||||
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
|
||||
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
|
||||
<Name>corlib\corlib-net_4_5</Name>
|
||||
<Name>corlib-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
|
||||
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
|
||||
<Name>System\System-net_4_5-2</Name>
|
||||
<ProjectReference Include="../System/System-net_4_5.csproj">
|
||||
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
|
||||
<Name>System-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">
|
||||
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
|
||||
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
|
||||
<Name>System.Core\System.Core-net_4_5</Name>
|
||||
<Name>System.Core-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
|
||||
<Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>
|
||||
<Name>System.XML\System.Xml-net_4_5-1</Name>
|
||||
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
|
||||
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
|
||||
<Name>System.Xml-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12.csproj">
|
||||
<ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-xbuild_12.csproj">
|
||||
<Project>{A5C3FA16-6C9E-4B57-9476-78E959BBC338}</Project>
|
||||
<Name>Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12</Name>
|
||||
<Name>Microsoft.Build.Framework-xbuild_12</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-xbuild_12.csproj">
|
||||
<ProjectReference Include="../Microsoft.Build.Utilities/Microsoft.Build.Utilities-xbuild_12.csproj">
|
||||
<Project>{4AEF77E9-BB34-44F2-9F35-64D11ECDE2A7}</Project>
|
||||
<Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-xbuild_12</Name>
|
||||
<Name>Microsoft.Build.Utilities-xbuild_12</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -14,6 +14,7 @@ Microsoft.Build.BuildEngine/ImportTest.cs
|
||||
Microsoft.Build.BuildEngine/InternalLoggerExceptionTest.cs
|
||||
Microsoft.Build.BuildEngine/InvalidProjectFileExceptionTest.cs
|
||||
Microsoft.Build.BuildEngine/ProjectTest.cs
|
||||
Microsoft.Build.BuildEngine/PredefinedPropertyFunctionsTest.cs
|
||||
Microsoft.Build.BuildEngine/TargetCollectionTest.cs
|
||||
Microsoft.Build.BuildEngine/TargetTest.cs
|
||||
Microsoft.Build.BuildEngine/TestNamespaceManager.cs
|
||||
|
||||
@@ -209,7 +209,38 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
|
||||
project.LoadXml (documentString);
|
||||
}
|
||||
|
||||
#if NET_4_0
|
||||
[Test]
|
||||
public void TestImportEmptyVariableWithConditionFalse ()
|
||||
{
|
||||
string documentString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
|
||||
<Import Project='$(ImportPath)' Condition='false' />
|
||||
<Target Name='Build' />
|
||||
</Project>";
|
||||
|
||||
engine = new Engine (Consts.BinPath);
|
||||
|
||||
project = engine.CreateNewProject ();
|
||||
project.LoadXml (documentString);
|
||||
|
||||
Assert.IsTrue (project.Build ("Build"), "Build failed");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestImportProjectWithConditionReferencingExtensionPath ()
|
||||
{
|
||||
string documentString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
|
||||
<Import Project='$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets' Condition=""Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets')"" />
|
||||
<Target Name='Build' />
|
||||
</Project>";
|
||||
|
||||
engine = new Engine (Consts.BinPath);
|
||||
|
||||
project = engine.CreateNewProject ();
|
||||
project.LoadXml (documentString);
|
||||
|
||||
Assert.IsTrue (project.Build ("Build"), "Build failed");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestImportWildcard ()
|
||||
{
|
||||
@@ -264,7 +295,6 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
|
||||
File.Delete (second_project);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
+78
@@ -0,0 +1,78 @@
|
||||
//
|
||||
// PredefinedPropertyFunctionsTest.cs
|
||||
//
|
||||
// Authors:
|
||||
// Alexander Köplinger ([email protected])
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
using System;
|
||||
using Microsoft.Build.BuildEngine;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace MonoTests.Microsoft.Build.BuildEngine {
|
||||
[TestFixture]
|
||||
public class PredefinedPropertyFunctionsTest {
|
||||
|
||||
[Test]
|
||||
public void TestMakeRelative ()
|
||||
{
|
||||
string documentString = @"
|
||||
<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
|
||||
<PropertyGroup>
|
||||
<Path1>c:\users\</Path1>
|
||||
<Path2>c:\users\username\</Path2>
|
||||
<Path3>/home/user/</Path3>
|
||||
<Path4>/home/user/username/</Path4>
|
||||
<Path5>/home/user/</Path5>
|
||||
<Path6>/tmp/test/file</Path6>
|
||||
<Path7>/home/user/</Path7>
|
||||
<Path8>/home/user/username/path with spaces + special? chars (1)/</Path8>
|
||||
<Path9>c:\users</Path9>
|
||||
<Path10>c:\users\username\test\</Path10>
|
||||
<Path11>/home/user</Path11>
|
||||
<Path12>/home/user/username/test/</Path12>
|
||||
<MakeRelative1>$([MSBuild]::MakeRelative($(Path1), $(Path2)))</MakeRelative1>
|
||||
<MakeRelative2>$([MSBuild]::MakeRelative($(Path2), $(Path1)))</MakeRelative2>
|
||||
<MakeRelative3>$([MSBuild]::MakeRelative($(Path3), $(Path4)))</MakeRelative3>
|
||||
<MakeRelative4>$([MSBuild]::MakeRelative($(Path4), $(Path3)))</MakeRelative4>
|
||||
<MakeRelative5>$([MSBuild]::MakeRelative($(Path5), $(Path6)))</MakeRelative5>
|
||||
<MakeRelative6>$([MSBuild]::MakeRelative($(Path7), $(Path8)))</MakeRelative6>
|
||||
<MakeRelative7>$([MSBuild]::MakeRelative($(Path9), $(Path10)))</MakeRelative7>
|
||||
<MakeRelative8>$([MSBuild]::MakeRelative($(Path11), $(Path12)))</MakeRelative8>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
";
|
||||
|
||||
var engine = new Engine (Consts.BinPath);
|
||||
var project = engine.CreateNewProject ();
|
||||
project.LoadXml (documentString);
|
||||
|
||||
Assert.AreEqual (@"username\", project.EvaluatedProperties ["MakeRelative1"].FinalValue, "#1");
|
||||
Assert.AreEqual (@"..\", project.EvaluatedProperties ["MakeRelative2"].FinalValue, "#2");
|
||||
Assert.AreEqual (@"username\", project.EvaluatedProperties ["MakeRelative3"].FinalValue, "#3");
|
||||
Assert.AreEqual (@"..\", project.EvaluatedProperties ["MakeRelative4"].FinalValue, "#4");
|
||||
Assert.AreEqual (@"..\..\tmp\test\file", project.EvaluatedProperties ["MakeRelative5"].FinalValue, "#5");
|
||||
Assert.AreEqual (@"username\path with spaces + special? chars (1)\", project.EvaluatedProperties ["MakeRelative6"].FinalValue, "#6");
|
||||
Assert.AreEqual (@"username\test\", project.EvaluatedProperties ["MakeRelative7"].FinalValue, "#7");
|
||||
Assert.AreEqual (@"username\test\", project.EvaluatedProperties ["MakeRelative8"].FinalValue, "#8");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ include $(XBUILD_DIR)/xbuild.make
|
||||
|
||||
LIBRARY = Microsoft.Build.Framework.dll
|
||||
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = \
|
||||
/r:$(corlib) \
|
||||
/r:System.dll
|
||||
|
||||
@@ -19,12 +19,13 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -32,7 +33,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -114,9 +115,13 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
@@ -125,13 +130,13 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
|
||||
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
|
||||
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
|
||||
<Name>corlib\corlib-net_4_5</Name>
|
||||
<Name>corlib-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
|
||||
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
|
||||
<Name>System\System-net_4_5-2</Name>
|
||||
<ProjectReference Include="../System/System-net_4_5.csproj">
|
||||
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
|
||||
<Name>System-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -9,6 +9,7 @@ LIBRARY = Microsoft.Build.Tasks.dll
|
||||
|
||||
LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
|
||||
|
||||
LIB_REFS = System System.Core System.Xml System.Windows.Forms
|
||||
LIB_MCS_FLAGS = \
|
||||
/r:$(corlib) \
|
||||
/r:System.dll \
|
||||
|
||||
@@ -198,9 +198,9 @@
|
||||
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
|
||||
<Name>System.XML\System.Xml-net_2_0-1</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">
|
||||
<ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_2_0.csproj">
|
||||
<Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>
|
||||
<Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>
|
||||
<Name>System.Windows.Forms\System.Windows.Forms-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5.csproj">
|
||||
<Project>{C3F8A358-9DA1-423C-8466-58AB30893EB0}</Project>
|
||||
|
||||
@@ -103,9 +103,9 @@
|
||||
<Compile Include="Microsoft.Build.Tasks\AspNetCompiler.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssemblyResolver.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignCulture.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignProjectConfiguration.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignTargetPath.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\CallTarget.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\CodeTaskFactory.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\CombinePath.cs" />
|
||||
@@ -205,7 +205,7 @@
|
||||
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
|
||||
<Name>System.Xml-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
|
||||
<ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
|
||||
<Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>
|
||||
<Name>System.Windows.Forms-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
|
||||
@@ -19,12 +19,13 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -32,7 +33,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -102,10 +103,11 @@
|
||||
<Compile Include="Microsoft.Build.Tasks\AspNetCompiler.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssemblyResolver.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignCulture.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignProjectConfiguration.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignTargetPath.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\CallTarget.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\CodeTaskFactory.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\CombinePath.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\CommandLineBuilderExtension.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\Copy.cs" />
|
||||
@@ -158,6 +160,7 @@
|
||||
<Compile Include="Microsoft.Build.Tasks\Vbc.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\VCBuild.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\Warning.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\WriteCodeFragment.cs" />
|
||||
<Compile Include="Microsoft.Build.Tasks\WriteLinesToFile.cs" />
|
||||
<Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceReader.cs" />
|
||||
<Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceWriter.cs" />
|
||||
@@ -171,9 +174,13 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
@@ -182,41 +189,41 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
|
||||
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
|
||||
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
|
||||
<Name>corlib\corlib-net_4_5</Name>
|
||||
<Name>corlib-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
|
||||
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
|
||||
<Name>System\System-net_4_5-2</Name>
|
||||
<ProjectReference Include="../System/System-net_4_5.csproj">
|
||||
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
|
||||
<Name>System-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">
|
||||
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
|
||||
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
|
||||
<Name>System.Core\System.Core-net_4_5</Name>
|
||||
<Name>System.Core-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
|
||||
<Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>
|
||||
<Name>System.XML\System.Xml-net_4_5-1</Name>
|
||||
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
|
||||
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
|
||||
<Name>System.Xml-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_5.csproj">
|
||||
<ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_4_5.csproj">
|
||||
<Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>
|
||||
<Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>
|
||||
<Name>System.Windows.Forms\System.Windows.Forms-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-xbuild_12.csproj">
|
||||
<ProjectReference Include="../Microsoft.Build.Utilities/Microsoft.Build.Utilities-xbuild_12.csproj">
|
||||
<Project>{4AEF77E9-BB34-44F2-9F35-64D11ECDE2A7}</Project>
|
||||
<Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-xbuild_12</Name>
|
||||
<Name>Microsoft.Build.Utilities-xbuild_12</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12.csproj">
|
||||
<ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-xbuild_12.csproj">
|
||||
<Project>{A5C3FA16-6C9E-4B57-9476-78E959BBC338}</Project>
|
||||
<Name>Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12</Name>
|
||||
<Name>Microsoft.Build.Framework-xbuild_12</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-xbuild_12.csproj">
|
||||
<ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-xbuild_12.csproj">
|
||||
<Project>{AA157F9D-4256-45F3-A07F-55E8E7E61A07}</Project>
|
||||
<Name>Microsoft.Build.Engine\Microsoft.Build.Engine-xbuild_12</Name>
|
||||
<Name>Microsoft.Build.Engine-xbuild_12</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-xbuild_12.csproj">
|
||||
<ProjectReference Include="../Mono.XBuild.Tasks/Mono.XBuild.Tasks-xbuild_12.csproj">
|
||||
<Project>{9E6DAF79-050B-4DF1-AD79-F3A848BE960C}</Project>
|
||||
<Name>Mono.XBuild.Tasks\Mono.XBuild.Tasks-xbuild_12</Name>
|
||||
<Name>Mono.XBuild.Tasks-xbuild_12</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -90,6 +90,26 @@ namespace MonoTests.Microsoft.Build.Tasks {
|
||||
});
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestLineWithEscapedSemicolon ()
|
||||
{
|
||||
string[] lines = new string[] { "abc%3Btest%3B%3B", "%3Bdef" };
|
||||
CreateProjectAndCheck (full_filepath, lines, false, true, delegate () {
|
||||
CheckFileExists (full_filepath, true);
|
||||
CheckLines (full_filepath, new string [] {"abc;test;;", ";def"});
|
||||
});
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestLineWithEscapedSpace ()
|
||||
{
|
||||
string[] lines = new string[] { " %20%20abc%20test ", " def%20%20" };
|
||||
CreateProjectAndCheck (full_filepath, lines, false, true, delegate () {
|
||||
CheckFileExists (full_filepath, true);
|
||||
CheckLines (full_filepath, new string [] {" abc test", "def "});
|
||||
});
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestNoOverwrite ()
|
||||
{
|
||||
@@ -210,7 +230,7 @@ namespace MonoTests.Microsoft.Build.Tasks {
|
||||
string[] actual = File.ReadAllLines (full_filepath);
|
||||
Assert.AreEqual (expected != null ? expected.Length : 0, actual.Length, "Number of lines written don't match");
|
||||
|
||||
if (expected != null)
|
||||
if (expected == null)
|
||||
return;
|
||||
int i = 0;
|
||||
foreach (string line in actual)
|
||||
|
||||
@@ -8,6 +8,7 @@ include $(XBUILD_DIR)/xbuild.make
|
||||
LIBRARY = Microsoft.Build.Utilities.dll
|
||||
LIBRARY_NAME = Microsoft.Build.Utilities$(NAME_SUFFIX).dll
|
||||
|
||||
LIB_REFS = System System.Core System.Xml
|
||||
LIB_MCS_FLAGS = \
|
||||
/r:$(corlib) \
|
||||
/r:System.dll \
|
||||
|
||||
@@ -19,12 +19,13 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -32,7 +33,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -47,7 +48,6 @@
|
||||
<Compile Include="..\..\build\common\Consts.cs" />
|
||||
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
|
||||
<Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />
|
||||
<Compile Include="..\System\System.Collections.Specialized\ProcessStringDictionary.cs" />
|
||||
<Compile Include="Assembly\AssemblyInfo.cs" />
|
||||
<Compile Include="Microsoft.Build.Utilities\AppDomainIsolatedTask.cs" />
|
||||
<Compile Include="Microsoft.Build.Utilities\CommandLineBuilder.cs" />
|
||||
@@ -55,6 +55,7 @@
|
||||
<Compile Include="Microsoft.Build.Utilities\IAsyncOperation.cs" />
|
||||
<Compile Include="Microsoft.Build.Utilities\IProcessAsyncOperation.cs" />
|
||||
<Compile Include="Microsoft.Build.Utilities\Logger.cs" />
|
||||
<Compile Include="Microsoft.Build.Utilities\MSBuildErrorParser.cs" />
|
||||
<Compile Include="Microsoft.Build.Utilities\ProcessService.cs" />
|
||||
<Compile Include="Microsoft.Build.Utilities\ProcessWrapper.cs" />
|
||||
<Compile Include="Microsoft.Build.Utilities\TargetDotNetFrameworkVersion.cs" />
|
||||
@@ -74,9 +75,13 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
@@ -85,17 +90,25 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
|
||||
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
|
||||
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
|
||||
<Name>corlib\corlib-net_4_5</Name>
|
||||
<Name>corlib-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
|
||||
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
|
||||
<Name>System\System-net_4_5-2</Name>
|
||||
<ProjectReference Include="../System/System-net_4_5.csproj">
|
||||
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
|
||||
<Name>System-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12.csproj">
|
||||
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
|
||||
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
|
||||
<Name>System.Core-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
|
||||
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
|
||||
<Name>System.Xml-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-xbuild_12.csproj">
|
||||
<Project>{A5C3FA16-6C9E-4B57-9476-78E959BBC338}</Project>
|
||||
<Name>Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12</Name>
|
||||
<Name>Microsoft.Build.Framework-xbuild_12</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -173,7 +173,7 @@ namespace Microsoft.Build.Utilities
|
||||
}
|
||||
public override string ToString ()
|
||||
{
|
||||
return escapedItemSpec;
|
||||
return ItemSpec;
|
||||
}
|
||||
|
||||
public string ItemSpec {
|
||||
|
||||
@@ -7,6 +7,7 @@ include $(XBUILD_DIR)/xbuild.make
|
||||
|
||||
LIBRARY = Microsoft.Build.dll
|
||||
|
||||
LIB_REFS = System System.Core System.Xml Microsoft.Build.Engine Microsoft.Build.Framework
|
||||
LIB_MCS_FLAGS = \
|
||||
/r:$(corlib) \
|
||||
/r:System.dll \
|
||||
|
||||
@@ -19,12 +19,13 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12;MICROSOFT_BUILD_DLL</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE;MICROSOFT_BUILD_DLL</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -32,7 +33,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12;MICROSOFT_BUILD_DLL</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE;MICROSOFT_BUILD_DLL</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -162,9 +163,13 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
@@ -173,29 +178,29 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
|
||||
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
|
||||
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
|
||||
<Name>corlib\corlib-net_4_5</Name>
|
||||
<Name>corlib-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
|
||||
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
|
||||
<Name>System\System-net_4_5-2</Name>
|
||||
<ProjectReference Include="../System/System-net_4_5.csproj">
|
||||
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
|
||||
<Name>System-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">
|
||||
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
|
||||
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
|
||||
<Name>System.Core\System.Core-net_4_5</Name>
|
||||
<Name>System.Core-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
|
||||
<Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>
|
||||
<Name>System.XML\System.Xml-net_4_5-1</Name>
|
||||
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
|
||||
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
|
||||
<Name>System.Xml-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-xbuild_12.csproj">
|
||||
<ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-xbuild_12.csproj">
|
||||
<Project>{AA157F9D-4256-45F3-A07F-55E8E7E61A07}</Project>
|
||||
<Name>Microsoft.Build.Engine\Microsoft.Build.Engine-xbuild_12</Name>
|
||||
<Name>Microsoft.Build.Engine-xbuild_12</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12.csproj">
|
||||
<ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-xbuild_12.csproj">
|
||||
<Project>{A5C3FA16-6C9E-4B57-9476-78E959BBC338}</Project>
|
||||
<Name>Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12</Name>
|
||||
<Name>Microsoft.Build.Framework-xbuild_12</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -115,8 +115,7 @@
|
||||
<IISUrl>http://localhost:18572/</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
</CustomServerUrl>
|
||||
<CustomServerUrl></CustomServerUrl>
|
||||
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
|
||||
</WebProjectProperties>
|
||||
</FlavorProperties>
|
||||
|
||||
@@ -4,7 +4,8 @@ include ../../build/rules.make
|
||||
|
||||
LIBRARY = Microsoft.CSharp.dll
|
||||
|
||||
LIB_MCS_FLAGS = -r:System.Core.dll -r:Mono.CSharp.dll
|
||||
LIB_REFS = System.Core Mono.CSharp
|
||||
LIB_MCS_FLAGS =
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
@@ -3,7 +3,8 @@ SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = Microsoft.VisualC.dll
|
||||
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = /r:$(corlib)
|
||||
NO_TEST = yes
|
||||
|
||||
include ../../build/library.make
|
||||
@@ -3,9 +3,8 @@ SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = Microsoft.Web.Infrastructure.dll
|
||||
LIB_MCS_FLAGS = -r:System.dll \
|
||||
-r:System.Configuration.dll \
|
||||
-r:System.Web.dll
|
||||
LIB_REFS = System System.Configuration System.Web
|
||||
LIB_MCS_FLAGS =
|
||||
|
||||
EXTRA_DISTFILES = $(RESOURCE_FILES)
|
||||
|
||||
|
||||
@@ -120,4 +120,4 @@
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -4,7 +4,8 @@ include ../../build/rules.make
|
||||
|
||||
LIBRARY = Mono.C5.dll
|
||||
LIBRARY_SNK = c5.snk
|
||||
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll -nowarn:169,219,414,1030,3001,3005,3006
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = /r:$(corlib) -nowarn:169,219,414,1030,3001,3005,3006
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
|
||||
|
||||
EXTRA_DISTFILES = \
|
||||
|
||||
@@ -136,4 +136,4 @@
|
||||
<VisualStudio>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -1,27 +1,27 @@
|
||||
# Makefile for C5 book examples
|
||||
|
||||
USERGUIDEFILES= Anagrams.cs Antipatterns.cs CollectionSanity.cs EventPatterns.cs \
|
||||
Fileindex.cs GConvexHull.cs GNfaToDfa.cs GettingStarted.cs \
|
||||
Graph.cs Graphcopy.cs HashCodes.cs Jobqueue.cs \
|
||||
KeywordRecognition.cs ListPatterns.cs ListPatterns.cs \
|
||||
Locking.cs MultiDictionary.cs PointLocation.cs \
|
||||
RandomSelection.cs ReadOnlyPatterns.cs Sets.cs \
|
||||
SortedIterationPatterns.cs SortedIterationPatterns.cs \
|
||||
SortingPermutation.cs Toposort.cs ViewPatterns.cs WrappedArray.cs
|
||||
|
||||
all: c5examples.zip
|
||||
|
||||
c5examples.zip: ${USERGUIDEFILES}
|
||||
rm -f C5.examples.zip
|
||||
zip C5.examples.zip ${USERGUIDEFILES}
|
||||
|
||||
clean:
|
||||
rm -f C5.examples.zip
|
||||
rm -f *.dot
|
||||
rm -f *.exe
|
||||
rm -f *.ps
|
||||
rm -f *.eps
|
||||
|
||||
.SUFFIXES :
|
||||
.SUFFIXES : .cs
|
||||
|
||||
# Makefile for C5 book examples
|
||||
|
||||
USERGUIDEFILES= Anagrams.cs Antipatterns.cs CollectionSanity.cs EventPatterns.cs \
|
||||
Fileindex.cs GConvexHull.cs GNfaToDfa.cs GettingStarted.cs \
|
||||
Graph.cs Graphcopy.cs HashCodes.cs Jobqueue.cs \
|
||||
KeywordRecognition.cs ListPatterns.cs ListPatterns.cs \
|
||||
Locking.cs MultiDictionary.cs PointLocation.cs \
|
||||
RandomSelection.cs ReadOnlyPatterns.cs Sets.cs \
|
||||
SortedIterationPatterns.cs SortedIterationPatterns.cs \
|
||||
SortingPermutation.cs Toposort.cs ViewPatterns.cs WrappedArray.cs
|
||||
|
||||
all: c5examples.zip
|
||||
|
||||
c5examples.zip: ${USERGUIDEFILES}
|
||||
rm -f C5.examples.zip
|
||||
zip C5.examples.zip ${USERGUIDEFILES}
|
||||
|
||||
clean:
|
||||
rm -f C5.examples.zip
|
||||
rm -f *.dot
|
||||
rm -f *.exe
|
||||
rm -f *.ps
|
||||
rm -f *.eps
|
||||
|
||||
.SUFFIXES :
|
||||
.SUFFIXES : .cs
|
||||
|
||||
@@ -107,4 +107,4 @@
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
|
||||
</Project>
|
||||
</Project>
|
||||
@@ -4,7 +4,8 @@ include ../../build/rules.make
|
||||
|
||||
LIBRARY = Mono.CSharp.dll
|
||||
|
||||
LIB_MCS_FLAGS = -r:System.Core.dll -r:System.Xml.dll -r:System.dll
|
||||
LIB_REFS = System.Core System.Xml System
|
||||
LIB_MCS_FLAGS =
|
||||
|
||||
MOBILE_STATIC := $(filter mobile_static monotouch, $(PROFILE))
|
||||
|
||||
|
||||
Loaded 100 of 3513 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user