mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 01:41:17 -10:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
49f22ec804 | ||
|
|
7d78877800 | ||
|
|
87a052504b | ||
|
|
26e759903e | ||
|
|
12ca38606d | ||
|
|
0ab383de1e | ||
|
|
132135cb22 | ||
|
|
5066d707ac |
No files matched your search
Vendored
+1
-1
Submodule external/bockbuild updated: a7fadd170e...855e3737d8.
Vendored
+1
-1
Submodule external/nuget-buildtasks updated: 9e04cc7f41...b58ba42823.
@@ -49,9 +49,15 @@ namespace MonoTests.System.Globalization
|
||||
|
||||
c = CultureInfo.InvariantCulture;
|
||||
Assert.AreEqual (2, c.NumberFormat.CurrencyDecimalDigits, "#3");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void AllCulturesCanParseNegativeNumber ()
|
||||
{
|
||||
foreach (var c in CultureInfo.GetCultures (CultureTypes.AllCultures))
|
||||
{
|
||||
int.Parse ("-1", c);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1287
-1292
File diff suppressed because it is too large.
Load diff
@@ -897,7 +897,10 @@ mono_profiler_shutdown (void)
|
||||
prof->shutdown_callback (prof->profiler);
|
||||
}
|
||||
|
||||
mono_profiler_set_events ((MonoProfileFlags)0);
|
||||
/* Clear all events */
|
||||
for (prof = prof_list; prof; prof = prof->next)
|
||||
prof->events = (MonoProfileFlags)0;
|
||||
mono_profiler_events = (MonoProfileFlags)0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -8,7 +8,7 @@ class FsharpPackage(GitHubTarballPackage):
|
||||
override_properties={ 'make': 'make' })
|
||||
|
||||
self.extra_stage_files = ['lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Targets']
|
||||
self.sources.extend(['patches/fsharp-portable-pdb.patch', 'patches/fsharp-metadata-table-size-fix.patch'])
|
||||
self.sources.extend(['patches/fsharp-portable-pdb.patch', 'patches/fsharp-metadata-table-size-fix.patch', 'patches/fsharp-install-netsdk-targets.patch'])
|
||||
|
||||
def prep(self):
|
||||
Package.prep(self)
|
||||
|
||||
@@ -3,7 +3,7 @@ import fileinput
|
||||
class MSBuild (GitHubPackage):
|
||||
def __init__ (self):
|
||||
GitHubPackage.__init__ (self, 'mono', 'msbuild', '15.4',
|
||||
revision = '5633e38dd86d5ca588a7a3b9c8e961b5f7bdcf62')
|
||||
revision = 'f296e67b6004dd39c3f43b177bcf45dfbe931341')
|
||||
|
||||
def build (self):
|
||||
self.sh ('./cibuild.sh --scope Compile --target Mono --host Mono --config Release')
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
From 066a39a0ccd98222a0e372a443e59e28182def50 Mon Sep 17 00:00:00 2001
|
||||
From: nosami <[email protected]>
|
||||
Date: Thu, 14 Sep 2017 18:54:49 +0100
|
||||
Subject: [PATCH] Install Microsoft.FSharp.NetSdk.props and targets into Mono
|
||||
|
||||
So that F# .NET Core 2.0 templates can be built with VS for Mac and
|
||||
Mono msbuild. Re: https://bugzilla.xamarin.com/show_bug.cgi?id=57771
|
||||
|
||||
Searching the .NET Core sdk files we see:
|
||||
|
||||
/Sdks/Microsoft.NET.Sdk/build/Microsoft.NET.Sdk.FSharp.props:
|
||||
|
||||
```
|
||||
<FSharpPropsShim Condition = " '$(FSharpPropsShim)' == '' and Exists('$(MSBuildToolsPath)\FSharp\Microsoft.FSharp.NetSdk.props') ">$(MSBuildToolsPath)\FSharp\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
|
||||
|
||||
<FSharpPropsShim Condition = " '$(FSharpPropsShim)' == '' and Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.NetSdk.props') ">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
|
||||
|
||||
<Import Condition=" '$(UseBundledFSharpTargets)' == 'true' and
|
||||
Exists('$(FSharpPropsShim)') " Project="$(FSharpPropsShim)" />
|
||||
```
|
||||
---
|
||||
mono/config.make.in | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/mono/config.make.in b/mono/config.make.in
|
||||
index 6249aca46..573717208 100644
|
||||
--- a/mono/config.make.in
|
||||
+++ b/mono/config.make.in
|
||||
@@ -194,6 +194,18 @@ install-sdk-lib:
|
||||
$(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \
|
||||
$(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \
|
||||
$(INSTALL_LIB) $(tmpdir)Microsoft.Portable.FSharp.Targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \
|
||||
+ \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/; \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.props $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \
|
||||
+ \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp/; \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp/; \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/; \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/; \
|
||||
+ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.NetSdk.targets $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp/; \
|
||||
fi
|
||||
@if test x-$(outsuffix) = x-net40; then \
|
||||
if test -e $(outdir)$(NAME).dll; then \
|
||||
@@ -2,7 +2,7 @@ diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets b/src/fsharp/FShar
|
||||
index 34d716485..ec99e87ed 100644
|
||||
--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
|
||||
+++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
|
||||
@@ -41,6 +41,16 @@ this file.
|
||||
@@ -41,6 +41,21 @@ this file.
|
||||
<RootNamespace Condition="'$(RootNamespace)'==''">RootNamespace</RootNamespace>
|
||||
<Actual32Bit Condition="'$(TargetFrameworkVersion)'=='v2.0' or '$(TargetFrameworkVersion)'=='v3.0' or '$(TargetFrameworkVersion)'=='v3.5' or '$(TargetFrameworkVersion)'=='v4.0'">false</Actual32Bit>
|
||||
<Actual32Bit Condition="!('$(TargetFrameworkVersion)'=='v2.0' or '$(TargetFrameworkVersion)'=='v3.0' or '$(TargetFrameworkVersion)'=='v3.5' or '$(TargetFrameworkVersion)'=='v4.0')">$(Prefer32Bit)</Actual32Bit>
|
||||
@@ -15,7 +15,12 @@ index 34d716485..ec99e87ed 100644
|
||||
+ <_ConfigurationNameTmp>$(ConfigurationName)</_ConfigurationNameTmp>
|
||||
+ <_ConfigurationNameTmp Condition="'$(ConfigurationName)' == ''">$(Configuration)</_ConfigurationNameTmp>
|
||||
+
|
||||
+ <!-- _DebugFileExt is not an upstream msbuild feature yet -->
|
||||
+ <_DebugFileExt>.pdb</_DebugFileExt>
|
||||
+ <_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
|
||||
+
|
||||
+ <DebugType Condition="'$(OS)' != 'Windows_NT' And ('$(DebugSymbols)'=='True' or ('$(DebugSymbols)'=='' And '$(_ConfigurationNameTmp)'=='Debug'))">portable</DebugType>
|
||||
+ <DebugType Condition="'$(FscDebugType)' != ''">$(FscDebugType)</DebugType>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
@@ -1177,10 +1177,13 @@ namespace Mono.Tools.LocaleBuilder
|
||||
if (el != null)
|
||||
ni.PositiveSign = el.InnerText;
|
||||
|
||||
// CLDR uses unicode negative sign for some culture (e.g sv, is, lt, don't kwnow why) but .NET always
|
||||
// uses simple "-" sign and what is worse the parsing code cannot deal with non-ASCII values
|
||||
ni.NegativeSign = "-";
|
||||
|
||||
/*
|
||||
el = node.SelectSingleNode ("minusSign");
|
||||
if (el != null) {
|
||||
// CLDR uses unicode negative sign for some culture (e.g sv, is, lt, don't kwnow why) but .net always
|
||||
// uses simple - sign
|
||||
switch (el.InnerText) {
|
||||
case "\u2212":
|
||||
case "\u200F\u002D": // Remove any right-to-left mark characters
|
||||
@@ -1194,7 +1197,7 @@ namespace Mono.Tools.LocaleBuilder
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
el = node.SelectSingleNode ("infinity");
|
||||
|
||||
// We cannot use the value from CLDR because many broken
|
||||
|
||||
@@ -41,7 +41,7 @@ minimal: locale-builder.exe locale-data
|
||||
$(RUNTIME) locale-builder.exe --locales '$(MINIMAL_LOCALES)'
|
||||
|
||||
locale-data:
|
||||
if ! test -d CLDR/common ; then \
|
||||
if ! test -e CLDR/common/supplemental/supplementalData.xml ; then \
|
||||
curl http://www.unicode.org/Public/cldr/30.0.2/core.zip -o core.zip ; \
|
||||
unzip core.zip -d CLDR ; \
|
||||
fi
|
||||
|
||||
Reference in new issue
Block a user