Skip to content
This repository was archived by the owner on Aug 29, 2018. It is now read-only.

Commit c1df1b9

Browse files
committed
Updated MaterialSkin Lib
* Update MaterialSkin lib * Changed Target FW to 4.6.1 * Cleaned
1 parent d991574 commit c1df1b9

14 files changed

+37
-33
lines changed

Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/3DNUS Material Edition.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>_3DNUS_Material_Edition</RootNamespace>
1111
<AssemblyName>3DNUS Material Edition</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1515
<TargetFrameworkProfile />
@@ -23,6 +23,7 @@
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2627
</PropertyGroup>
2728
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2829
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +33,7 @@
3233
<DefineConstants>TRACE</DefineConstants>
3334
<ErrorReport>prompt</ErrorReport>
3435
<WarningLevel>4</WarningLevel>
36+
<Prefer32Bit>false</Prefer32Bit>
3537
</PropertyGroup>
3638
<PropertyGroup>
3739
<ApplicationIcon>new_3dnus_logo.ico</ApplicationIcon>
@@ -68,6 +70,7 @@
6870
<PlatformTarget>x64</PlatformTarget>
6971
<ErrorReport>prompt</ErrorReport>
7072
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
73+
<Prefer32Bit>false</Prefer32Bit>
7174
</PropertyGroup>
7275
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
7376
<OutputPath>bin\x64\Release\</OutputPath>
@@ -77,15 +80,11 @@
7780
<PlatformTarget>x64</PlatformTarget>
7881
<ErrorReport>prompt</ErrorReport>
7982
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
83+
<Prefer32Bit>false</Prefer32Bit>
8084
</PropertyGroup>
8185
<ItemGroup>
82-
<Reference Include="Ionic.Zip">
83-
<HintPath>..\..\..\old\upd_extract_Source\upd_extract\bin\x86\Release\Ionic.Zip.dll</HintPath>
84-
</Reference>
8586
<Reference Include="MaterialSkin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
86-
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>..\..\MaterialSkin.dll</HintPath>
88-
<EmbedInteropTypes>False</EmbedInteropTypes>
87+
<HintPath>..\packages\MaterialSkin.Updated.0.2.2\lib\MaterialSkin.dll</HintPath>
8988
</Reference>
9089
<Reference Include="System" />
9190
<Reference Include="System.Core" />
@@ -174,6 +173,7 @@
174173
<DependentUpon>Resources.resx</DependentUpon>
175174
<DesignTime>True</DesignTime>
176175
</Compile>
176+
<None Include="packages.config" />
177177
<None Include="Properties\Settings.settings">
178178
<Generator>SettingsSingleFileGenerator</Generator>
179179
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/App.config

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@
22
<configuration>
33
<configSections>
44
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="_3DNUS_Material_Edition.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="true" />
5+
<section name="_3DNUS_Material_Edition.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="true"/>
66
</sectionGroup>
77
</configSections>
88
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
1010
</startup>
1111
<userSettings>
1212
<_3DNUS_Material_Edition.Properties.Settings>
1313
<setting name="dev_auto_upd" serializeAs="String">
14-
<value />
14+
<value/>
1515
</setting>
1616
<setting name="dev_dump_info" serializeAs="String">
17-
<value />
17+
<value/>
1818
</setting>
1919
<setting name="dev_flags" serializeAs="String">
20-
<value />
20+
<value/>
2121
</setting>
2222
<setting name="dev_def_titlelist" serializeAs="String">
23-
<value />
23+
<value/>
2424
</setting>
2525
<setting name="dev_music" serializeAs="String">
26-
<value />
26+
<value/>
2727
</setting>
2828
<setting name="dev_mode" serializeAs="String">
29-
<value />
29+
<value/>
3030
</setting>
3131
<setting name="eula_read" serializeAs="String">
32-
<value />
32+
<value/>
3333
</setting>
3434
<setting name="dev_tour" serializeAs="String">
35-
<value />
35+
<value/>
3636
</setting>
3737
</_3DNUS_Material_Edition.Properties.Settings>
3838
</userSettings>
39-
</configuration>
39+
</configuration>

Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("3.2.2")]
35-
[assembly: AssemblyFileVersion("3.2.2")]
34+
[assembly: AssemblyVersion("3.2.3")]
35+
[assembly: AssemblyFileVersion("3.2.3")]

Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Resources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/bin/Debug/3DNUS Material Edition.exe.config

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@
22
<configuration>
33
<configSections>
44
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="_3DNUS_Material_Edition.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="true" />
5+
<section name="_3DNUS_Material_Edition.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="true"/>
66
</sectionGroup>
77
</configSections>
88
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
1010
</startup>
1111
<userSettings>
1212
<_3DNUS_Material_Edition.Properties.Settings>
1313
<setting name="dev_auto_upd" serializeAs="String">
14-
<value />
14+
<value/>
1515
</setting>
1616
<setting name="dev_dump_info" serializeAs="String">
17-
<value />
17+
<value/>
1818
</setting>
1919
<setting name="dev_flags" serializeAs="String">
20-
<value />
20+
<value/>
2121
</setting>
2222
<setting name="dev_def_titlelist" serializeAs="String">
23-
<value />
23+
<value/>
2424
</setting>
2525
<setting name="dev_music" serializeAs="String">
26-
<value />
26+
<value/>
2727
</setting>
2828
<setting name="dev_mode" serializeAs="String">
29-
<value />
29+
<value/>
3030
</setting>
3131
<setting name="eula_read" serializeAs="String">
32-
<value />
32+
<value/>
3333
</setting>
3434
<setting name="dev_tour" serializeAs="String">
35-
<value />
35+
<value/>
3636
</setting>
3737
</_3DNUS_Material_Edition.Properties.Settings>
3838
</userSettings>
39-
</configuration>
39+
</configuration>

Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs

Whitespace-only changes.

Source/3DNUS_Material_Source/3DNUS Material Edition/3DNUS Material Edition/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs

Whitespace-only changes.

0 commit comments

Comments
 (0)