Skip to content

Commit af2458e

Browse files
TaritsynTaritsyn
committed
ResxToCs was updated to version 1.0.0 Alpha 4
1 parent 1b2c589 commit af2458e

6 files changed

Lines changed: 93 additions & 95 deletions

File tree

‎src/MsieJavaScriptEngine.Net4/MsieJavaScriptEngine.Net40.csproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1616
<RestorePackages>true</RestorePackages>
17-
<NuGetPackageImportStamp>9c0c6282</NuGetPackageImportStamp>
17+
<NuGetPackageImportStamp>93f7ad1b</NuGetPackageImportStamp>
18+
<DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -596,14 +597,14 @@
596597
</PropertyGroup>
597598
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
598599
<Error Condition="!Exists('..\..\packages\BuildBundlerMinifier.2.3.327\build\BuildBundlerMinifier.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\BuildBundlerMinifier.2.3.327\build\BuildBundlerMinifier.targets'))" />
599-
<Error Condition="!Exists('..\..\packages\ResxToCs.MSBuild.1.0.0-alpha2\build\ResxToCs.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ResxToCs.MSBuild.1.0.0-alpha2\build\ResxToCs.MSBuild.targets'))" />
600+
<Error Condition="!Exists('..\..\packages\ResxToCs.MSBuild.1.0.0-alpha4\build\ResxToCs.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ResxToCs.MSBuild.1.0.0-alpha4\build\ResxToCs.MSBuild.targets'))" />
600601
</Target>
601602
<Import Project="..\..\packages\BuildBundlerMinifier.2.3.327\build\BuildBundlerMinifier.targets" Condition="Exists('..\..\packages\BuildBundlerMinifier.2.3.327\build\BuildBundlerMinifier.targets')" />
602-
<Import Project="..\..\packages\ResxToCs.MSBuild.1.0.0-alpha2\build\ResxToCs.MSBuild.targets" Condition="Exists('..\..\packages\ResxToCs.MSBuild.1.0.0-alpha2\build\ResxToCs.MSBuild.targets')" />
603-
<Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile" Condition=" '$(ResxToCsConversionWasRun)' != 'true' ">
604-
<ResxToCsTask ResourceDirectory="..\MsieJavaScriptEngine\Resources\" />
605-
<PropertyGroup>
606-
<ResxToCsConversionWasRun>true</ResxToCsConversionWasRun>
607-
</PropertyGroup>
603+
<Import Project="..\..\packages\ResxToCs.MSBuild.1.0.0-alpha4\build\ResxToCs.MSBuild.targets" Condition="Exists('..\..\packages\ResxToCs.MSBuild.1.0.0-alpha4\build\ResxToCs.MSBuild.targets')" />
604+
<Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile">
605+
<ResxToCsTask
606+
InputDirectory="..\MsieJavaScriptEngine\Resources\"
607+
Namespace="$(RootNamespace).Resources"
608+
InternalAccessModifier="true" />
608609
</Target>
609610
</Project>

‎src/MsieJavaScriptEngine.Net4/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="BuildBundlerMinifier" version="2.3.327" targetFramework="net40-Client" />
4-
<package id="ResxToCs.MSBuild" version="1.0.0-alpha2" targetFramework="net40-Client" />
4+
<package id="ResxToCs.MSBuild" version="1.0.0-alpha4" targetFramework="net40-Client" />
55
</packages>

‎src/MsieJavaScriptEngine/MsieJavaScriptEngine.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<ItemGroup>
4040
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.337" />
41-
<DotNetCliToolReference Include="dotnet-resx2cs" Version="1.0.0-alpha2" />
41+
<DotNetCliToolReference Include="dotnet-resx2cs" Version="1.0.0-alpha4" />
4242
</ItemGroup>
4343

4444
<Target Name="BundleMinify" BeforeTargets="BeforeCompile" Condition=" '$(BundleMinifyWasRun)' != 'true' ">
@@ -47,10 +47,7 @@
4747
<BundleMinifyWasRun>true</BundleMinifyWasRun>
4848
</PropertyGroup>
4949
</Target>
50-
<Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile" Condition=" '$(ResxToCsConversionWasRun)' != 'true' ">
51-
<Exec Command="dotnet resx2cs ./Resources/" />
52-
<PropertyGroup>
53-
<ResxToCsConversionWasRun>true</ResxToCsConversionWasRun>
54-
</PropertyGroup>
50+
<Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile">
51+
<Exec Command="dotnet resx2cs -n '$(RootNamespace).Resources' -i './Resources/'" />
5552
</Target>
5653
</Project>

‎src/MsieJavaScriptEngine/Resources/CommonStrings.Designer.cs‎

Lines changed: 37 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)