Skip to content

Commit

Permalink
General enhancements
Browse files Browse the repository at this point in the history
UTF8 + NuGet
  • Loading branch information
ennerperez committed Oct 21, 2018
1 parent 45a7277 commit 6a8054b
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 48 deletions.
Binary file added .editoricon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 1 addition & 27 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,38 +1,12 @@
----------------

ConfuserEx is licensed under MIT license.

----------------

Copyright (c) 2014 yck1509

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

----------------

MSBuild.ConfuserEx is licensed under MIT license.

----------------

The MIT License (MIT)

Copyright (c) 2017 Enner P�rez
Copyright (c) 2018 Enner Pérez

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion MSBuild.ConfuserEx.Test/Confuser.crproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://confuser.codeplex.com" baseDir="bin\Release" outputDir="confused">
<rule pattern="true" preset="aggressive" />
<module path="MSBuild.ConfuserEx.Test.exe" />
Expand Down
8 changes: 6 additions & 2 deletions MSBuild.ConfuserEx.sln
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2046
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".files", ".files", "{5A49A884-1C02-43DD-80CA-E7C1E53905E5}"
ProjectSection(SolutionItems) = preProject
.editoricon.png = .editoricon.png
LICENSE = LICENSE
README.md = README.md
VERSION = VERSION
Expand Down Expand Up @@ -37,4 +38,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FDE72A99-67E0-4FD4-9576-F041190868E7}
EndGlobalSection
EndGlobal
6 changes: 3 additions & 3 deletions MSBuild.ConfuserEx/Package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<title>$id$</title>
<authors>Enner Pérez</authors>
<owners>Enner Pérez</owners>
<licenseUrl>https://raw.githubusercontent.com/yck1509/ConfuserEx/master/LICENSE</licenseUrl>
<projectUrl>https://nuget.org/packages/Confuser.Targets</projectUrl>
<iconUrl>https://raw.githubusercontent.com/yck1509/ConfuserEx/master/ConfuserEx/ConfuserEx.ico</iconUrl>
<licenseUrl>https://raw.githubusercontent.com/ennerperez/msbuild-confuserex/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/ennerperez/msbuild-confuserex</projectUrl>
<iconUrl>https://raw.githubusercontent.com/ennerperez/msbuild-confuserex/master/.editoricon.png</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<developmentDependency>true</developmentDependency>
<description>Build targets interface of ConfuserEx</description>
Expand Down
11 changes: 5 additions & 6 deletions MSBuild.ConfuserEx/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
#else
[assembly: AssemblyConfiguration("RELEASE")]
#endif
[assembly: AssemblyCompany("yck1509")]
[assembly: AssemblyCompany("Enner Pérez")]
[assembly: AssemblyProduct("MSBuild.ConfuserEx")]
[assembly: AssemblyCopyright("Copyright (C) Ki 2014")]

[assembly: AssemblyVersion("1.0.0.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: NeutralResourcesLanguage("en")]
[assembly: AssemblyCopyright("Copyright (C) Enner Pérez 2018")]
[assembly: AssemblyVersion("1.0.1.*")]
[assembly: AssemblyFileVersion("1.0.1")]
[assembly: NeutralResourcesLanguage("en")]
9 changes: 3 additions & 6 deletions MSBuild.ConfuserEx/build/MSBuild.ConfuserEx.targets
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and

<ConfuserToolsPath Condition="'$(NuGetProjectStyle)' != 'PackageReference'">$(MSBuildThisFileDirectory)..\..\ConfuserEx.Final.1.0.0\tools</ConfuserToolsPath>
<ConfuserToolsPath Condition="'$(NuGetProjectStyle)' != 'PackageReference' And !Exists('$(ConfuserToolsPath)')">$(SolutionDir)packages\ConfuserEx.Final.1.0.0\tools</ConfuserToolsPath>

</PropertyGroup>

<PropertyGroup>
Expand All @@ -43,22 +42,20 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and

<!-- Commands -->
<ConfuseCommand>$(ConfuserCommand) "$(ProjectFileName)"</ConfuseCommand>

</PropertyGroup>

<Target Name="CheckPrerequisites">
<!-- Raise an error if we're unable to locate confuser.cli.exe -->
<Error Condition="'$(DownloadConfuserExe)' != 'true' AND !Exists('$(ConfuserExePath)')" Text="Unable to locate '$(ConfuserExePath)'" />
</Target>

<Target Name="Confuser" AfterTargets="AfterBuild" DependsOnTargets="CheckPrerequisites" Condition="Exists('$(ProjectFileName)') and '$(ConfigurationName)' == 'Release'" >
<MakeDir Directories="$(TargetDir)confused"/>
<Target Name="Confuser" AfterTargets="AfterBuild" DependsOnTargets="CheckPrerequisites" Condition="Exists('$(ProjectFileName)') and '$(ConfigurationName)' == 'Release'">
<MakeDir Directories="$(TargetDir)confused" />
<Exec WorkingDirectory="$(ProjectDir)" Command="$(ConfuseCommand)" />
<ItemGroup>
<FilesToMove Include="$(TargetDir)confused\*.*"/>
<FilesToMove Include="$(TargetDir)confused\*.*" />
</ItemGroup>
<Move SourceFiles="@(FilesToMove)" DestinationFolder="$(TargetDir)" OverwriteReadOnlyFiles="true" Condition=" '$(OS)' == 'Windows_NT'" />
<RemoveDir Directories="$(TargetDir)confused" Condition=" '$(OS)' == 'Windows_NT'" />
</Target>

</Project>
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ MSBuild.ConfuserEx
========
MSBuild.ConfuserEx is a target for ConfuserEx integration in MSBuild process.

[![Build status](https://ci.appveyor.com/api/projects/status/melev7x8iigtmryx?svg=true)](https://ci.appveyor.com/project/ennerperez/confuserex)
[![Build status](https://ci.appveyor.com/api/projects/status/ttwbutio7e2dwptb?svg=true)](https://ci.appveyor.com/project/ennerperez/msbuild-confuserex)
[![NuGet](https://img.shields.io/nuget/v/MSBuild.ConfuserEx.svg)](https://www.nuget.org/packages/MSBuild.ConfuserEx/)

ConfuserEx
========
ConfuserEx is a open-source protector for .NET applications.
It is the successor of [Confuser](http://confuser.codeplex.com) project.
It is the successor of [Confuser](https://yck1509.github.io/ConfuserEx/) project.

License
-------
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
1.0.1

0 comments on commit 6a8054b

Please sign in to comment.