diff --git a/Antumbra/Antumbra.csproj b/Antumbra/Antumbra.csproj
index 96a79843..66321d4d 100644
--- a/Antumbra/Antumbra.csproj
+++ b/Antumbra/Antumbra.csproj
@@ -24,8 +24,8 @@
false
false
true
- 2
- 0.1.0.%2a
+ 0
+ 1.0.0.%2a
false
true
true
@@ -64,11 +64,11 @@
false
full
x86
- false
+ true
prompt
ManagedMinimumRules.ruleset
true
- false
+ true
false
false
diff --git a/Antumbra/ExtensionFramework/Management/MEFHelper.cs b/Antumbra/ExtensionFramework/Management/MEFHelper.cs
index d0b7b1a8..1e4f5df8 100644
--- a/Antumbra/ExtensionFramework/Management/MEFHelper.cs
+++ b/Antumbra/ExtensionFramework/Management/MEFHelper.cs
@@ -7,7 +7,7 @@
namespace Antumbra.Glow.ExtensionFramework.Management {
- public class MEFHelper : Loggable {
+ public class MEFHelper : Loggable, IDisposable {
#region Private Fields
@@ -50,6 +50,19 @@ public MEFHelper() {
#region Public Methods
+ public void Dispose()
+ {
+ foreach (var each in FullList)
+ {
+ each.Dispose();
+ }
+
+ if (container != null)
+ {
+ container.Dispose();
+ }
+ }
+
public void AttachObserver(LogMsgObserver observer) {
NewLogMsgAvail += observer.NewLogMsgAvail;
}
diff --git a/Antumbra/Properties/AssemblyInfo.cs b/Antumbra/Properties/AssemblyInfo.cs
index 0f5b66a3..23520158 100644
--- a/Antumbra/Properties/AssemblyInfo.cs
+++ b/Antumbra/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
//
// You can specify all the values or you can default the Build and Revision Numbers by using the '*'
// as shown below: [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]
diff --git a/FlatTabControl/FlatTabControl.cs b/FlatTabControl/FlatTabControl.cs
index a717b7f2..fbaca6e1 100644
--- a/FlatTabControl/FlatTabControl.cs
+++ b/FlatTabControl/FlatTabControl.cs
@@ -463,7 +463,7 @@ private void InitializeComponent() {
}
[Browsable(true)]
- new public Color myBackColor {
+ public Color myBackColor {
get { return mBackColor; }
set { mBackColor = value; this.Invalidate(); }
}
diff --git a/WintumbraInstaller/WintumbraInstaller.iss b/WintumbraInstaller/WintumbraInstaller.iss
index 44643082..90e41d3c 100644
--- a/WintumbraInstaller/WintumbraInstaller.iss
+++ b/WintumbraInstaller/WintumbraInstaller.iss
@@ -1,6 +1,6 @@
[Setup]
AppName = "Antumbra"
-AppVersion = 1.0.0.0-RC_3
+AppVersion = 1.0.0
AppId = "Wintumbra"
SetupIconFile = Antumbra.ico
AppPublisher = "Antumbra Technologies Inc."
@@ -15,7 +15,8 @@ DisableProgramGroupPage = auto
Name: "{commonprograms}\Antumbra"; Filename: "{app}\Antumbra.exe"
[Files]
-Source: "..\deps\wintumbra\dotNetFx45_Full_setup.exe"; DestDir: {tmp}; Flags: deleteafterinstall; Check: FrameworkIsNotInstalled
+Source: "..\deps\wintumbra\dotNetFx45_Full_setup.exe"; DestDir: {tmp}; Flags: deleteafterinstall; Check: DotNetFrameworkIsNotInstalled
+Source: "..\deps\wintumbra\DirectX\*"; DestDir: {tmp}; Flags: deleteafterinstall;
Source: "..\deps\libwdi\*.dll"; DestDir: {app}\DriverInstaller
Source: "..\deps\win32-libantumbra\glowdrvinst.exe"; DestDir: {app}\DriverInstaller\
Source: "dependencies\*.dll"; DestDir: {app}\Extensions
@@ -34,11 +35,12 @@ Type: files; Name: "%appdata%\Antumbra\wintumbra.log"
Type: files; Name: "{app}\Extensions\*.dll"
[Run]
-Filename: "{tmp}\dotNetFx45_Full_setup.exe"; Check: FrameworkIsNotInstalled
+Filename: "{tmp}\dotNetFx45_Full_setup.exe"; Check: DotNetFrameworkIsNotInstalled
+Filename: "{tmp}\DXSETUP.exe";
Filename: "{app}\DriverInstaller\glowdrvinst.exe"; Parameters: "batch"
[code]
-function FrameworkIsNotInstalled: Boolean;
+function DotNetFrameworkIsNotInstalled: Boolean;
begin
Result := not RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\.NETFramework\policy\v4.5');
end;
diff --git a/deps b/deps
index 192e1236..7f23d892 160000
--- a/deps
+++ b/deps
@@ -1 +1 @@
-Subproject commit 192e1236bd1bca129a8ea3c54cbcd3ef0b1d5c69
+Subproject commit 7f23d8925deea8004099a9ecf5e398c99db8ba7b