Skip to content

Commit 8681288

Browse files
jonchamjoncham
authored
Merge pull request #717 from Unity-Technologies/unity-master-merge
Merge master
2 parents 4de5580 + 06c98ab commit 8681288

File tree

497 files changed

+3209
-5538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

497 files changed

+3209
-5538
lines changed

‎CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/llvm @vargaz
3636

3737
/man @marek-safar @miguel
38-
/man/mprof-report.1 @alexrp
38+
/man/*prof* @alexrp
3939

4040
/mcs @marek-safar
4141

‎acceptance-tests/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUNTIME = MONO_PATH=$(CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
1414
TOOLS_RUNTIME = MONO_PATH=$(TOOLS_CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
1515
MCS = $(TOOLS_RUNTIME) $(CSC) -nologo -noconfig -lib:$(CLASS) -r:System.dll -r:System.Core.dll -r:System.Xml.dll -r:Microsoft.CSharp.dll
1616
ILASM = $(TOOLS_RUNTIME) $(TOOLS_CLASS)/ilasm.exe
17+
XUNIT = $(RUNTIME) $(abs_top_builddir)/external/xunit-binaries/xunit.console.exe
1718

1819
include versions.mk
1920
include profiler-stress.mk

‎acceptance-tests/SUBMODULES.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[
22
{
33
"name": "roslyn",
4-
"url": "git://github.com/dotnet/roslyn.git",
5-
"rev": "322bd5b2bbf07df6a67de35cbcb2365484412f70",
6-
"remote-branch": "origin/master",
7-
"branch": "master",
4+
"url": "git://github.com/mono/roslyn.git",
5+
"rev": "1d9895045041925490038c5df0d8f947d8dcbd7f",
6+
"remote-branch": "origin/mono-testing",
7+
"branch": "mono-testing",
88
"directory": "roslyn"
99
},
1010
{
1111
"name": "coreclr",
1212
"url": "git://github.com/mono/coreclr.git",
13-
"rev": "d0e6a36f782f5ee1ca0b7d3ec0c55725c3571b1f",
13+
"rev": "83d8279997d8ce4ad344ff9b937b2d13d074dcaa",
1414
"remote-branch": "origin/mono",
1515
"branch": "mono",
1616
"directory": "coreclr"

‎acceptance-tests/coreclr.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ coreclr-runtest-coremanglib: coreclr-validate test-runner.exe $(CORECLR_COREMANG
3232
check-coreclr: coreclr-compile-tests coreclr-runtest-basic coreclr-runtest-coremanglib
3333

3434
coreclr-gcstress: coreclr-validate GCStressTests.exe $(CORECLR_STRESSTESTSI_CS)
35-
BVT_ROOT=$(realpath $(CORECLR_PATH)/tests/src/GC/Stress/Tests) $(RUNTIME) GCStressTests.exe $(CORECLR_PATH)/tests/src/GC/Stress/testmix_gc.config; if [ $$? -ne 100 ]; then exit 1; fi
35+
BVT_ROOT=$(realpath $(CORECLR_PATH)/tests/src/GC/Stress/Tests) $(RUNTIME) GCStressTests.exe $(CORECLR_PATH)/tests/src/GC/Stress/$(if $(CI_PR),testmix_gc_pr.config,testmix_gc.config); if [ $$? -ne 100 ]; then exit 1; fi
3636

3737
# Output a variable in $(2) to the file $(1), separated by newline characters
3838
# we need to do it in groups of 100 entries to make sure we don't exceed shell char limits

‎acceptance-tests/roslyn.mk

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
check-roslyn:
22
@$(MAKE) validate-roslyn RESET_VERSIONS=1
3-
@if [ -z $$PREFIX ]; then echo "You need to set PREFIX to the prefix of the Mono installation that should be used for testing Roslyn." && exit 1; fi
4-
sed -i -e 's/\\4.5-api"/\\4.5"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
5-
export MSBuildExtensionsPath=$$PREFIX/lib/mono/xbuild; \
6-
MONO_DOTNET_PORTABLE_DIR=$$PREFIX/lib/mono/xbuild-frameworks/.NETPortable/; \
7-
if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR/v4.6" ]; then \
8-
mkdir -p $$MONO_DOTNET_PORTABLE_DIR; \
9-
curl -SL "http://download.mono-project.com/third-party/RoslynBuildDependencies.zip" > /tmp/RoslynBuildDependencies.zip; \
10-
unzip -o /tmp/RoslynBuildDependencies.zip -d /tmp/RoslynBuildDependencies; \
11-
cp -r /tmp/RoslynBuildDependencies/PortableReferenceAssemblies/* $$MONO_DOTNET_PORTABLE_DIR; \
12-
fi; \
133
cd $(ROSLYN_PATH); \
14-
sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \
15-
sed -i -e 's#-xml Binaries/\$$BUILD_CONFIGURATION/xUnitResults/#-nunit $(abs_top_builddir)/acceptance-tests/TestResult-#g' cibuild.sh; \
16-
./cibuild.sh --mono-path $$PREFIX/bin || EXIT_CODE=1; \
17-
sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
18-
exit $$EXIT_CODE
4+
./mono-testing.sh "$(XUNIT)" || exit; \
5+
echo "done"

‎data/net_4_5/machine.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<section name="assemblyBinding" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
1212
<section name="satelliteassemblies" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
1313
<section name="startup" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
14-
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1514
<section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1615
<section name="system.diagnostics" type="System.Diagnostics.SystemDiagnosticsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1716
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
1817
<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
18+
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1919
<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
2020
<section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
2121
<sectionGroup name="system.runtime.serialization" type="System.Runtime.Serialization.Configuration.SerializationSectionGroup, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

‎docs/api-style.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@
4343
line-height: 0px;
4444
}
4545

46+
.mapi-codeblock {
47+
display: block;
48+
padding: 5pt 5pt;
49+
margin: 10pt;
50+
white-space: pre;
51+
font-family: monospace;
52+
border: 1px solid rgba(233,233,233,1);
53+
background-color: rgba(249,249,249,1);
54+
}
55+
4656
.mapi-entry code {
4757
border: none;
4858
background-color: transparent;

‎docs/exdoc

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ sub process_function {
124124
my $body = '';
125125
my $returns = '';
126126
my $prototype = '';
127+
my $codeblock = 'false';
127128

128129
while (<$file>) {
129130

@@ -156,7 +157,6 @@ sub process_function {
156157
if (defined($deprecated)) {
157158
process_formatting(\$deprecated, $file_path, $.);
158159
}
159-
$body =~ s/\n/ /g;
160160

161161
if (exists($docs->{body}->{$name})) {
162162
my $origin = $docs->{origin}->{$name};
@@ -180,8 +180,16 @@ sub process_function {
180180
chomp;
181181
s/^ +\*//;
182182

183-
# Replace blank lines with paragraph breaks.
184-
$_ = '<p>' if /^\s*$/;
183+
if (/\s*\\code$/) {
184+
$codeblock = 'true';
185+
} elsif (/\s*\\endcode$/) {
186+
$codeblock = 'false';
187+
}
188+
189+
# Replace blank lines with paragraph breaks if we're not in a code block.
190+
if (/^\s*$/) {
191+
$_ = '<p>' if $codeblock eq 'false';
192+
}
185193

186194
if ($section == $PARAMETER_SECTION) {
187195
if (/\s*\\param +(\w+)(.*)/) {
@@ -210,7 +218,7 @@ sub process_function {
210218
$returns = "\t$_\n";
211219
$section = $RETURN_SECTION;
212220
} else {
213-
$body .= "\n\t$_";
221+
$body .= "\n$_";
214222
}
215223
} elsif ($section == $RETURN_SECTION) {
216224
$returns .= "\n\t$_";
@@ -227,6 +235,12 @@ sub process_formatting {
227235
my ($content, $file_path, $current_line) = @_;
228236
$_ = $$content;
229237

238+
# General formatting
239+
s{\\b +(\w+)}{<strong>$1</strong>}g;
240+
s{\\a +(\w+)}{<i>$1</i>}g;
241+
s{\\e +(\w+)}{<i>$1</i>}g;
242+
s{\\em +(\w+)}{<i>$1</i>}g;
243+
230244
# Constants
231245
s{NULL}{<code>NULL</code>}g;
232246
s{TRUE}{<code>TRUE</code>}g;
@@ -243,6 +257,8 @@ sub process_formatting {
243257
warn "$file_path:$current_line: Old-style monodoc notation '`code`' used\n"
244258
if s{\`((?!api:)[:.\w\*]+)\`}{<code>$1</code>}g && $WARNINGS;
245259
s{\\c +(\S+(?<![.,:;]))}{<code>$1</code>}g;
260+
s{\\code}{<pre><code class="mapi-codeblock">}g;
261+
s{\\endcode}{</code></pre>}g;
246262

247263
$$content = $_;
248264
}

0 commit comments

Comments
 (0)