Skip to content
This repository was archived by the owner on Nov 3, 2023. It is now read-only.

Commit 9bae7fd

Browse files
committed
Build a 4.5 profile too, and make it the default.
1 parent 4af7649 commit 9bae7fd

File tree

8 files changed

+47
-7
lines changed

8 files changed

+47
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ class/lib/moonlight
1919
class/lib/monodroid
2020
class/lib/net_2_0
2121
class/lib/net_4_0
22+
class/lib/net_4_5
2223
scripts/vbnc
2324
scripts/vbnc2

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
thisdir := .
22

33
SUBDIRS := build man class vbruntime
4-
net_4_0_SUBDIRS := tools vbnc scripts $(SUBDIRS)
4+
net_4_5_SUBDIRS := tools vbnc scripts $(SUBDIRS)
55

6-
DIST_SUBDIRS := $(net_4_0_SUBDIRS)
6+
DIST_SUBDIRS := $(net_4_5_SUBDIRS)
77

88
include build/rules.make
99

build/profiles/net_4_5.make

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# -*- makefile -*-
2+
3+
profile-check:
4+
@:
5+
6+
PROFILE_VBNC_FLAGS = /sdkpath:$(prefix)/lib/mono/4.5/
7+
FRAMEWORK_VERSION = 4.5

build/rules.make

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ endif
9393
# Rest of the configuration
9494

9595
ifndef PROFILE
96-
PROFILE = net_4_0
96+
PROFILE = net_4_5
9797
endif
9898

9999
include $(topdir)/build/profiles/$(PROFILE).make
100100
-include $(topdir)/build/config.make
101101

102102

103103
# vbnc is built in one the profiles (currently net_2_0, this will likely change to net_4_0 soon)
104-
PROFILES = net_2_0 net_4_0 $(CONFIGURED_PROFILES)
104+
PROFILES = net_2_0 net_4_0 net_4_5 $(CONFIGURED_PROFILES)
105105
PLATFORMS = linux win32
106106

107107

scripts/vbnc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
exec mono --debug $MONO_OPTIONS @prefix@/lib/mono/4.0/vbnc.exe "$@"
2+
exec @prefix@/bin/mono --debug $MONO_OPTIONS @prefix@/lib/mono/4.0/vbnc.exe "$@"

scripts/vbnc2.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
exec mono --debug $MONO_OPTIONS @prefix@/lib/mono/4.0/vbnc.exe /sdkpath:@prefix@/lib/mono/2.0/ "$@"
2+
exec @prefix@/bin/mono --debug $MONO_OPTIONS @prefix@/lib/mono/4.0/vbnc.exe /sdkpath:@prefix@/lib/mono/2.0/ "$@"

vbruntime/Microsoft.VisualBasic/AssemblyInfo.vb

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,19 @@ Imports System.Security
6565
<Assembly: AssemblyFileVersion("1.1.20806.0")>
6666
<Assembly: AssemblyDefaultAlias("Microsoft.VisualBasic.dll")>
6767
#Else
68-
#If NET_VER >= 4.0 Then
68+
#If NET_VER >= 4.5 Then
69+
<Assembly: AssemblyVersion("11.0.0.0")>
70+
<Assembly: ComVisible(True)>
71+
'<Assembly: Guid("aa353322-85a4-4601-a6b7-e3b724e9350c")>
72+
<Assembly: CLSCompliant(True)>
73+
<Assembly: Debuggable(DebuggableAttribute.DebuggingModes.Default Or DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)>
74+
<Assembly: CompilationRelaxations(CompilationRelaxations.NoStringInterning)>
75+
<Assembly: RuntimeCompatibility(WrapNonExceptionThrows:=True)>
76+
<Assembly: SatelliteContractVersion("11.0.0.0")>
77+
<Assembly: AssemblyInformationalVersion("11.0.30319.17020")>
78+
<Assembly: AssemblyFileVersion("11.0.30319.17020")>
79+
<Assembly: AssemblyDefaultAlias("Microsoft.VisualBasic.dll")>
80+
#ElseIf NET_VER >= 4.0 Then
6981
<Assembly: AssemblyVersion("10.0.0.0")>
7082
<Assembly: ComVisible(True)>
7183
'<Assembly: Guid("aa353322-85a4-4601-a6b7-e3b724e9350c")>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/define:NET_VER=4.5
2+
/res:strings2.resources,strings.resources
3+
/debug:full
4+
/r:System.dll
5+
/r:mscorlib.dll
6+
/r:System.Windows.Forms.dll
7+
/r:System.Data.dll
8+
/r:System.Drawing.dll
9+
/r:System.Web.dll
10+
/r:System.Xml.dll
11+
/novbruntimeref
12+
/define:_MYTYPE=\"Empty\"
13+
/t:library
14+
/optionstrict+
15+
/imports:System,System.Collections,System.Data,System.Diagnostics
16+
/out:Microsoft.VisualBasic.dll
17+
/define:_MYTYPE=\"Empty\"
18+
/imports:System.Collections.Generic
19+
/codepage:65001
20+
/noconfig

0 commit comments

Comments
 (0)