Skip to content

Commit 24d715e

Browse files
TaritsynTaritsyn
committed
ResxToCs was updated to version 1.0.0 Alpha 5
1 parent b461294 commit 24d715e

File tree

20 files changed

+148
-183
lines changed

20 files changed

+148
-183
lines changed

‎samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4.csproj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,6 @@
179179
<Target Name="GulpBuild" AfterTargets="AfterBuild">
180180
<Exec Command="gulp build-assets" />
181181
</Target>
182-
<Target Name="GulpRebuild" AfterTargets="AfterRebuild">
183-
<Exec Command="gulp" />
184-
</Target>
185182
<ProjectExtensions>
186183
<VisualStudio>
187184
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -210,10 +207,4 @@
210207
<Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win-x86.props'))" />
211208
<Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.3.0.0-alpha7\build\JavaScriptEngineSwitcher.ChakraCore.Native.win8-arm.props'))" />
212209
</Target>
213-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
214-
Other similar extension points exist, see Microsoft.Common.targets.
215-
<Target Name="BeforeBuild">
216-
</Target>
217-
<Target Name="AfterBuild">
218-
</Target> -->
219210
</Project>

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1.csproj‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<VersionPrefix>3.0.0</VersionPrefix>
55
<VersionSuffix>alpha8</VersionSuffix>
66
<TargetFramework>netcoreapp1.0</TargetFramework>
7-
<RuntimeFrameworkVersion>1.0.7</RuntimeFrameworkVersion>
7+
<RuntimeFrameworkVersion>1.0.8</RuntimeFrameworkVersion>
88
<OutputType>Exe</OutputType>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1010
<PreserveCompilationContext>true</PreserveCompilationContext>
@@ -20,12 +20,12 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.4" />
24-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.5" />
25-
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="1.0.5" />
26-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.4" />
27-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.5" />
28-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.4" />
23+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.5" />
24+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.6" />
25+
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="1.0.6" />
26+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.5" />
27+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.6" />
28+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.5" />
2929
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
3030
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
3131
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
@@ -52,15 +52,12 @@
5252
</None>
5353
</ItemGroup>
5454

55-
<Target Name="GulpClean" AfterTargets="Clean" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
55+
<Target Name="GulpClean" AfterTargets="Clean">
5656
<Exec Command="gulp clean-builded-assets" />
5757
</Target>
58-
<Target Name="GulpBuild" AfterTargets="AfterBuild" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
58+
<Target Name="GulpBuild" AfterTargets="AfterBuild">
5959
<Exec Command="gulp build-assets" />
6060
</Target>
61-
<Target Name="GulpRebuild" AfterTargets="AfterRebuild" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
62-
<Exec Command="gulp" />
63-
</Target>
6461
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
6562
<Exec Command="npm install" />
6663
<Exec Command="bower install" />

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.4" />
23-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.5" />
24-
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="1.0.5" />
25-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.4" />
26-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.5" />
27-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.4" />
22+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.5" />
23+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.6" />
24+
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="1.0.6" />
25+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.5" />
26+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.6" />
27+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.5" />
2828
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
2929
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
3030
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
@@ -55,15 +55,12 @@
5555
</None>
5656
</ItemGroup>
5757

58-
<Target Name="GulpClean" AfterTargets="Clean" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
58+
<Target Name="GulpClean" AfterTargets="Clean">
5959
<Exec Command="gulp clean-builded-assets" />
6060
</Target>
61-
<Target Name="GulpBuild" AfterTargets="AfterBuild" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
61+
<Target Name="GulpBuild" AfterTargets="AfterBuild">
6262
<Exec Command="gulp build-assets" />
6363
</Target>
64-
<Target Name="GulpRebuild" AfterTargets="AfterRebuild" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
65-
<Exec Command="gulp" />
66-
</Target>
6764
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
6865
<Exec Command="npm install" />
6966
<Exec Command="bower install" />

‎samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
22+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
2323
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
2525
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
@@ -41,7 +41,7 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
44+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1" />
4545
</ItemGroup>
4646

4747
<ItemGroup>
@@ -50,15 +50,12 @@
5050
</None>
5151
</ItemGroup>
5252

53-
<Target Name="GulpClean" AfterTargets="Clean" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
53+
<Target Name="GulpClean" AfterTargets="Clean">
5454
<Exec Command="gulp clean-builded-assets" />
5555
</Target>
56-
<Target Name="GulpBuild" AfterTargets="AfterBuild" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
56+
<Target Name="GulpBuild" AfterTargets="AfterBuild">
5757
<Exec Command="gulp build-assets" />
5858
</Target>
59-
<Target Name="GulpRebuild" AfterTargets="AfterRebuild" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
60-
<Exec Command="gulp" />
61-
</Target>
6259
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
6360
<Exec Command="npm install" />
6461
<Exec Command="bower install" />

‎samples/JavaScriptEngineSwitcher.Sample.Logic/JavaScriptEngineSwitcher.Sample.Logic.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
</ItemGroup>
2525

2626
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' Or '$(TargetFramework)' == 'net451' ">
27-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.0.5" />
28-
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="1.0.5" />
27+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.0.6" />
28+
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="1.0.6" />
2929
</ItemGroup>
3030

3131
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
32-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
33-
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.0" />
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" />
33+
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.1" />
3434
</ItemGroup>
3535

3636
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">

‎samples/JavaScriptEngineSwitcher.Sample.Resources/CommonStrings.Designer.cs‎

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

‎samples/JavaScriptEngineSwitcher.Sample.Resources/EvaluationStrings.Designer.cs‎

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

‎samples/JavaScriptEngineSwitcher.Sample.Resources/JavaScriptEngineSwitcher.Sample.Resources.csproj‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
88
<OutputType>Library</OutputType>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10+
<DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
1011

1112
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1213
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -20,6 +21,7 @@
2021

2122
<ItemGroup>
2223
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.1.0" PrivateAssets="All" />
24+
<PackageReference Include="ResxToCs.MSBuild" Version="1.0.0-alpha5" PrivateAssets="All" />
2325
</ItemGroup>
2426

2527
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
@@ -34,15 +36,8 @@
3436
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
3537
</ItemGroup>
3638

37-
<ItemGroup>
38-
<DotNetCliToolReference Include="dotnet-resx2cs" Version="1.0.0-alpha2" />
39-
</ItemGroup>
40-
41-
<Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile" Condition=" '$(ResxToCsConversionWasRun)' != 'true' ">
42-
<Exec Command="dotnet resx2cs" />
43-
<PropertyGroup>
44-
<ResxToCsConversionWasRun>true</ResxToCsConversionWasRun>
45-
</PropertyGroup>
39+
<Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile">
40+
<ResxToCsTask Namespace="$(RootNamespace)" />
4641
</Target>
4742

4843
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

‎src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
1313
<NoWarn>$(NoWarn);CS1591</NoWarn>
1414
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15+
<DisableDefaultResxToCsConversionTarget>true</DisableDefaultResxToCsConversionTarget>
1516

1617
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1718
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -25,6 +26,7 @@
2526

2627
<ItemGroup>
2728
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.1.0" PrivateAssets="All" />
29+
<PackageReference Include="ResxToCs.MSBuild" Version="1.0.0-alpha5" PrivateAssets="All" />
2830

2931
<ProjectReference Include="..\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj" />
3032
</ItemGroup>
@@ -37,15 +39,11 @@
3739
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
3840
</ItemGroup>
3941

40-
<ItemGroup>
41-
<DotNetCliToolReference Include="dotnet-resx2cs" Version="1.0.0-alpha2" />
42-
</ItemGroup>
43-
44-
<Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile" Condition=" '$(ResxToCsConversionWasRun)' != 'true' ">
45-
<Exec Command="dotnet resx2cs ./Resources/" />
46-
<PropertyGroup>
47-
<ResxToCsConversionWasRun>true</ResxToCsConversionWasRun>
48-
</PropertyGroup>
42+
<Target Name="СonvertResxToCs" BeforeTargets="BeforeCompile">
43+
<ResxToCsTask
44+
InputDirectory="./Resources/"
45+
Namespace="$(RootNamespace).Resources"
46+
InternalAccessModifier="true" />
4947
</Target>
5048

5149
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

0 commit comments

Comments
 (0)