Skip to content

Commit

Permalink
Updated to use .NET 4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@malware-dev
malware-dev committed Apr 13, 2023
1 parent 35284a3 commit aee4bfb
Show file tree
Hide file tree
Showing 27 changed files with 1,993 additions and 326 deletions.
3 changes: 2 additions & 1 deletion Source/ExtensionClass/ExtensionClass.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<TargetFrameworkProfile />
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand All @@ -14,7 +15,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ExtensionClass</RootNamespace>
<AssemblyName>ExtensionClass</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<GeneratePkgDefFile>false</GeneratePkgDefFile>
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
Expand Down
1 change: 0 additions & 1 deletion Source/ExtensionClass/ExtensionClass.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<TemplateID>f8451166-5b1e-4d52-8765-159447f3ef5f</TemplateID>
<ProjectType>CSharp</ProjectType>
<AppliesTo>CSharp + SharedAssetsProject</AppliesTo>
<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
<DefaultName>Class.cs</DefaultName>
</TemplateData>
Expand Down
2 changes: 0 additions & 2 deletions Source/IngameScriptTemplate/IngameScript.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<Icon>IngameScript.ico</Icon>
<AppliesTo>CSharp</AppliesTo>
<ProjectType>CSharp</ProjectType>
<RequiredFrameworkVersion>4.6.1</RequiredFrameworkVersion>
<MaxFrameworkVersion>4.6.1</MaxFrameworkVersion>
<NumberOfParentCategoriesToRollUp>2</NumberOfParentCategoriesToRollUp>
<SortOrder>1000</SortOrder>
<TemplateID>e8dc9f0e-c9d8-400b-b23d-b61e738f2a72</TemplateID>
Expand Down
2 changes: 1 addition & 1 deletion Source/IngameScriptTemplate/ProjectTemplate.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>IngameScript</RootNamespace>
<AssemblyName>$safeprojectname$</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
Expand Down
116 changes: 71 additions & 45 deletions Source/MDK/MDK.csproj
View file

Large diffs are not rendered by default.

148 changes: 74 additions & 74 deletions Source/MDK/app.config
View file

Large diffs are not rendered by default.

222 changes: 111 additions & 111 deletions Source/MDK/packages.config
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Source/MDK/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Space Engineers is trademarked to Keen Software House. This toolkit is fan-made,
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.8, 17.0)" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6.1,)" />
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.8,)" />
<!--<Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />-->
</Dependencies>
<Assets>
Expand Down
69 changes: 46 additions & 23 deletions Source/MDKServices/MDKServices.csproj
View file

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions Source/MDKServices/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.7.0.0" newVersion="16.7.0.0" />
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-16.7.0.0" newVersion="16.7.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="StreamJsonRpc" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0" />
<assemblyIdentity name="StreamJsonRpc" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.CoreUtility" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.0.0.0" newVersion="16.0.0.0" />
<assemblyIdentity name="Microsoft.VisualStudio.CoreUtility" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-16.0.0.0" newVersion="16.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.ImageCatalog" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.0.0.0" newVersion="16.0.0.0" />
<assemblyIdentity name="Microsoft.VisualStudio.ImageCatalog" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-16.0.0.0" newVersion="16.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
86 changes: 44 additions & 42 deletions Source/MDKServices/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="JetBrains.Annotations" version="2020.3.0" targetFramework="net461" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.VisualStudio.CoreUtility" version="16.8.239" targetFramework="net461" />
<package id="Microsoft.VisualStudio.ImageCatalog" version="16.7.30328.74" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Imaging" version="15.7.27703" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="16.7.30328.74" targetFramework="net461" />
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net461" />
<package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.21" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.15.0" version="15.7.27703" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Framework" version="15.7.27703" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6072" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30320" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61031" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30111" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" version="14.3.26929" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime" version="15.0.26929" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime" version="15.6.27413" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50728" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30730" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Text.Data" version="15.6.27740" targetFramework="net461" />
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6071" targetFramework="net461" />
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50728" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Threading" version="16.7.56" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Threading.Analyzers" version="16.7.56" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Utilities" version="15.7.27703" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Validation" version="15.5.31" targetFramework="net461" />
<package id="Microsoft.Win32.Registry" version="4.6.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="Scripty.MsBuild" version="0.7.4" targetFramework="net461" developmentDependency="true" />
<package id="StreamJsonRpc" version="1.4.121" targetFramework="net461" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
<package id="System.ComponentModel.Composition" version="4.5.0" targetFramework="net461" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net461" />
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
<package id="System.Security.AccessControl" version="4.6.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net461" />
<package id="System.Security.Principal.Windows" version="4.6.0" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net461" />
<package id="JetBrains.Annotations" version="2020.3.0" targetFramework="net48" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net48" />
<package id="Microsoft.VisualStudio.CoreUtility" version="16.8.239" targetFramework="net48" />
<package id="Microsoft.VisualStudio.ImageCatalog" version="16.7.30328.74" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Imaging" version="15.7.27703" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="16.7.30328.74" targetFramework="net48" />
<package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net48" />
<package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.21" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.15.0" version="15.7.27703" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Framework" version="15.7.27703" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6072" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30320" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61031" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30111" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" version="14.3.26929" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime" version="15.0.26929" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime" version="15.6.27413" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50728" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30730" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Text.Data" version="15.6.27740" targetFramework="net48" />
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6071" targetFramework="net48" />
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50728" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Threading" version="16.7.56" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Threading.Analyzers" version="16.7.56" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Utilities" version="15.7.27703" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Validation" version="15.5.31" targetFramework="net48" />
<package id="Microsoft.Win32.Registry" version="4.6.0" targetFramework="net48" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net48" />
<package id="Scripty.MsBuild" version="0.7.4" targetFramework="net48" developmentDependency="true" />
<package id="StreamJsonRpc" version="1.4.121" targetFramework="net48" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net48" />
<package id="System.ComponentModel.Composition" version="4.5.0" targetFramework="net48" />
<package id="System.IO" version="4.3.0" targetFramework="net48" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net48" />
<package id="System.Runtime" version="4.3.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net48" />
<package id="System.Security.AccessControl" version="4.6.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net48" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net48" />
<package id="System.Security.Principal.Windows" version="4.6.0" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net48" />
</packages>
3 changes: 2 additions & 1 deletion Source/MDKUtilities/MDKUtilities.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<SEBinPath>$(registry:HKEY_CURRENT_USER\Software\Malware\MDK@SEBinPath)</SEBinPath>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -12,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Malware.MDKUtilities</RootNamespace>
<AssemblyName>MDKUtilities</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
Expand Down
2 changes: 1 addition & 1 deletion Source/MDKUtilities/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Source/MDKWhitelistExtractor/MDKWhitelistExtractor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Malware.MDKWhitelistExtractor</RootNamespace>
<AssemblyName>MDKWhitelistExtractor</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
Loading

0 comments on commit aee4bfb

Please sign in to comment.