Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix paths to xlftool to make it work with VS 15.4 #301

Closed
wants to merge 3 commits into from
Closed

Fix paths to xlftool to make it work with VS 15.4 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a7037e
Fix paths to xlftool to make it work with VS 15.4
kant2002 Oct 26, 2017
f78d55c
Fix build errors
kant2002 Oct 30, 2017
1f1c1ae
Merge branch 'master' into build-scripts-fix
jayaranigarg Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scripts/build/TestFx.Loc.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@
<CreateItem Include="@(ResxResources)" AdditionalMetadata="Language=%(ResxLang.Identity)">
<Output ItemName="LocResourceFile" TaskParameter="Include"/>
</CreateItem>
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" />
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(ResxResources.Identity) -Xlf $(ResourceDirectory)\xlf\%(ResxResources.Filename).xlf" />
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see both fmdev.xlftool and fmdev.xlftool.0.1.3 paths in packages directory. Could this be a nuget change (may be newer version)?

56 $ ls D:\dd\gh\Microsoft\testfx\packages\fmdev*
    Directory: D:\dd\gh\Microsoft\testfx\packages


Mode                LastWriteTime         Length Name
----                -------------         ------ ----
d-----        6/12/2017   5:01 PM                fmdev.xlftool
d-----        6/12/2017   5:01 PM                fmdev.xlftool.0.1.3

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On my PC only single folder generated

PS > ls packages\fmdev*

    Каталог: D:\d\user\GitHub\testfx\packages

Mode                LastWriteTime         Length Name
----                -------------         ------ ----
d-----       10/30/2017   1:36 PM                fmdev.xlftool.0.1.3

<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe update -Resx %(ResxResources.Identity) -Xlf $(ResourceDirectory)\xlf\%(ResxResources.Filename).xlf" />
</Target>

<Target Name="CreateLocalizeResx" Condition="'$(IsLocalizedBuild)' == 'true'">
<CreateItem Include="@(ResxResources)" AdditionalMetadata="Language=%(ResxLang.Identity)">
<Output ItemName="LocResourceFile" TaskParameter="Include"/>
</CreateItem>
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\0.1.3\tools\xlftool.exe writeTarget -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe writeTarget -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
<ItemGroup>
<EmbeddedResource Include="$(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx" />
</ItemGroup>
</Target>

<!-- Localization for documentation files. -->
<Target Name="CopyLocalizedXmls" BeforeTargets="BeforeBuild" Condition="$(LocDocumentationSubPath) != ''">
<Exec Command="xcopy /Y /I /S /E $(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation\1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath) $(OutDir)" />
<Exec Command="xcopy /Y /I /S /E $(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath) $(OutDir)" />
</Target>

<!-- Localization for vsix files.-->
Expand Down
2 changes: 1 addition & 1 deletion ...tTests/PlatformServices.Universal.Unit.Tests/PlatformServices.Universal.Unit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="$(TestFxRoot)packages\Microsoft.Internal.TestPlatform.ObjectModel\14.0.0\lib\uap10.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
<Reference Include="$(TestFxRoot)packages\Microsoft.Internal.TestPlatform.ObjectModel.14.0.0\lib\uap10.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
Expand Down
1 change: 1 addition & 0 deletions test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<packages>
<package id="Castle.Core" version="4.0.0" targetFramework="net452" />
<package id="Moq" version="4.7.8" targetFramework="net452" />
<package id="Microsoft.Internal.TestPlatform.ObjectModel" version="14.0.0" targetFramework="net452" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can take only this change though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I make only this change on the #310. I still want to find a way how it will work on my PC and without potential problems for you CI setup. If there any hints what bad could happens on CI, I maybe could change something.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are still trying to investigate this. We will get back to you once we figure his out. We will keep this PR open to track this issue. Meanwhile, will push in the other PR.

Copy link
Member

@jayaranigarg jayaranigarg Nov 13, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kant2002 : There is a slight change in plan. I have pushed in the other PR and we will close this PR as well from here. I have created a separate issue to track this action item #311
Let me know if you have any concerns with this.

<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
</packages>