Skip to content

Commit

Permalink
remove submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
MerlinCooper committed Jun 21, 2020
1 parent 4959f21 commit 1d61338
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 14 deletions.
3 changes: 0 additions & 3 deletions SuperMFLib/.gitmodules

This file was deleted.

9 changes: 0 additions & 9 deletions SuperMFLib/SuperMFLib/SuperMFLib.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\ILMerge.3.0.40\build\ILMerge.props" Condition="Exists('..\..\packages\ILMerge.3.0.40\build\ILMerge.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -16,8 +15,6 @@
<SchemaVersion>2.0</SchemaVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<Optimize>false</Optimize>
Expand Down Expand Up @@ -130,10 +127,4 @@
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\ILMerge.3.0.40\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ILMerge.3.0.40\build\ILMerge.props'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion SuperMFLib/SuperMFLib/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILMerge" version="3.0.40" targetFramework="net35-client" />
<package id="ILMerge" version="2.14.1208" targetFramework="net451" />
</packages>
2 changes: 1 addition & 1 deletion SuperMFLib/mfnet
Submodule mfnet updated from 4a53a4 to 4c2658

0 comments on commit 1d61338

Please sign in to comment.