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

Finish localization of SDK #626

Merged
merged 10 commits into from
Jan 11, 2017
Merged

Finish localization of SDK #626

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
898ed8b
Let xliff converter tool make no-op changes after loc handback
nguerrera Jan 10, 2017
e4f1bb7
Convert xlf back to resx
nguerrera Jan 10, 2017
b747b2b
Work around public signing issue with satellite assemblies
nguerrera Jan 10, 2017
2484974
Build satellites
nguerrera Jan 10, 2017
fd595de
Add satellites to nuget package
nguerrera Jan 10, 2017
1d47a3e
Sign satellite assemblies
nguerrera Jan 11, 2017
74d310b
Use SDK bundled with CLI for "stage 0"
nguerrera Jan 11, 2017
a64fc8d
Add satellites to VS setup
nguerrera Jan 11, 2017
f6427fc
Merge branch 'dev15-rc3' into satellites
nguerrera Jan 11, 2017
11c6db8
Disable parallel builds to work around #475
nguerrera Jan 11, 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
4 changes: 3 additions & 1 deletion Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@

<OutputPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\$(Configuration)'))\</OutputPath>
<OutDir>$(OutputPath)</OutDir>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\obj\$(MSBuildProjectName)'))\</BaseIntermediateOutputPath>
<RootOutDir>$(OutDir)</RootOutDir>
<BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\obj\$(MSBuildProjectName)'))\</BaseIntermediateOutputPath>
<RawOutDir>$(OutDir)Raw\</RawOutDir>
<PackagesLayoutDir>$(OutDir)PackagesLayout\</PackagesLayoutDir>
<PackagesLayoutToolsDir>$(PackagesLayoutDir)tools\</PackagesLayoutToolsDir>
<PackagesLayoutToolsNet46Dir>$(PackagesLayoutToolsDir)net46\</PackagesLayoutToolsNet46Dir>
Expand Down
3 changes: 0 additions & 3 deletions build/DependencyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<!-- This file is imported by all projects at the beginning of the project files -->

<PropertyGroup>
<!-- SdkStage0Version is the version of the Microsoft.NET.Sdk we use to build ourselves -->
<SdkStage0Version>1.0.0-alpha-20161012-3</SdkStage0Version>

<MsBuildPackagesVersion>0.1.0-preview-00028-160627</MsBuildPackagesVersion>
<CoreSetupVersion>1.0.1-beta-000933</CoreSetupVersion>
<NuGetVersion>4.0.0-rc3</NuGetVersion>
Expand Down
3 changes: 2 additions & 1 deletion build/Nuget/Microsoft.NET.Nuget.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<PropertyGroup>
<NuGetOutDir>$(OutDir)Packages\</NuGetOutDir>
<OutDir>$(OutDir)Raw\</OutDir>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -45,7 +46,7 @@
Command="$(NuGetDownloadCommand)"
/>

<Exec Command="$(NuGetTool) Pack &quot;$(MSBuildProjectDirectory)\%(NuSpec.Identity)&quot; -verbosity quiet -basepath &quot;$(OutDir.TrimEnd('\'))&quot; -outputdirectory &quot;$(NuGetOutDir.TrimEnd('\'))&quot; %(NuSpec.NuGetArguments)"
<Exec Command="$(NuGetTool) Pack &quot;$(MSBuildProjectDirectory)\%(NuSpec.Identity)&quot; -verbosity quiet -basepath &quot;$(RootOutDir.TrimEnd('\'))&quot; -outputdirectory &quot;$(NuGetOutDir.TrimEnd('\'))&quot; %(NuSpec.NuGetArguments)"
Condition="'$(OS)' == 'Windows_NT'"/>
</Target>

Expand Down
11 changes: 11 additions & 0 deletions build/Nuget/Microsoft.NET.Sdk.Nuget.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,19 @@
<RelativePath>Sdk\%(RecursiveDir)</RelativePath>
</CopyLocalSdkFile>

<CopyLocalSatelliteAssembly Include="$(OutDir)\**\Microsoft.NET.Build.Tasks.resources.dll">
<RelativePath>tools\net46\</RelativePath>
</CopyLocalSatelliteAssembly>
<CopyLocalSatelliteAssembly Include="$(OutDir)\**\Microsoft.NET.Build.Tasks.resources.dll">
<RelativePath>tools\netcoreapp1.0\</RelativePath>
</CopyLocalSatelliteAssembly>
<CopyLocalSatelliteAssembly>
<RelativePath>%(RelativePath)%(RecursiveDir)</RelativePath>
</CopyLocalSatelliteAssembly>

<CopyLocalBuildFile Include="@(CopyLocalBuildCrossTargetingFile)" />
<CopyLocalBuildFile Include="@(CopyLocalSdkFile)" />
<CopyLocalBuildFile Include="@(CopyLocalSatelliteAssembly)" />
</ItemGroup>

<Copy SourceFiles="%(Net46CopyLocalAssembly.FullFilePath)"
Expand Down
15 changes: 14 additions & 1 deletion build/Signing/SignToolConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,20 @@
"certificate": "Microsoft402",
"strongName": "MsSharedLib72",
"values": [
"Microsoft.NET.Build.Tasks.dll"
"Raw/Microsoft.NET.Build.Tasks.dll",
Copy link
Contributor

Choose a reason for hiding this comment

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

Microsoft.NET.Build.Tasks.dll [](start = 21, length = 29)

So did the location of this DLL move, or is it in both places? Did you check that it is still packaged properly etc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It moved.

"Raw/cs/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/de/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/es/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/fr/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/it/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/ja/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/ko/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/pl/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/pt-BR/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/ru/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/tr/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/zh-Hans/Microsoft.NET.Build.Tasks.resources.dll",
"Raw/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll"
]
}
]
Expand Down
16 changes: 16 additions & 0 deletions build/Targets/Signing.Imports.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,21 @@
<DelaySign>true</DelaySign>
</PropertyGroup>
</Target>

<!--
Workaround https://github.com/Microsoft/msbuild/issues/1490 (lack of support for public-signing satellites) by
delay-signing satellite assemblies when main assembly is public-signed.
-->
<Target Name="PrepareToDelaySignSatelliteAssemblies" BeforeTargets="GenerateSatelliteAssemblies">
<PropertyGroup>
<_DelaySignMainAssembly>$(DelaySign)</_DelaySignMainAssembly>
<DelaySign Condition="'$(PublicSign)' == 'true'">true</DelaySign>
</PropertyGroup>
</Target>
<Target Name="CleanupAfterDelaySigningSatelliteAssemblies" AfterTargets="GenerateSatelliteAssemblies">
<PropertyGroup>
<DelaySign>$(_DelaySignMainAssembly)</DelaySign>
</PropertyGroup>
</Target>

</Project>
10 changes: 3 additions & 7 deletions src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand All @@ -15,6 +15,7 @@
<OutDir>$(OutDir)Tests\</OutDir>
<GenerateDependencyFile>false</GenerateDependencyFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<EnableDefaultItems>false</EnableDefaultItems>
<NonShipping>true</NonShipping>
<StartAction>Program</StartAction>
<StartProgram>$(DotNetTool).exe</StartProgram>
Expand All @@ -23,10 +24,6 @@
<DebugEngines>{2E36F1D4-B23C-435D-AB41-18E608940038}</DebugEngines>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>$(SdkStage0Version)</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="NuGet.ProjectModel">
<Version>$(NuGetVersion)</Version>
</PackageReference>
Expand Down Expand Up @@ -101,8 +98,7 @@
</ProjectReference>
</ItemGroup>
<Import Project="..\..\..\build\Targets\Signing.Imports.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild">
<Target Name="CustomAfterBuild" AfterTargets="Build">
<ItemGroup>
<CopyLocalAssembly Include="Microsoft.Build.Framework">
<Version>$(MsBuildPackagesVersion)</Version>
Expand Down
12 changes: 6 additions & 6 deletions src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectGuid>{DF7D2697-B3B4-45C2-8297-27245F528A99}</ProjectGuid>
<OutputType>Library</OutputType>
<OutDir>$(RawOutDir)</OutDir>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.NET.Build.Tasks</RootNamespace>
<AssemblyName>Microsoft.NET.Build.Tasks</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetFramework>netstandard1.3</TargetFramework>
<GenerateDependencyFile>false</GenerateDependencyFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<EnableDefaultItems>false</EnableDefaultItems>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk">
<Version>$(SdkStage0Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.ProjectModel">
<Version>$(NuGetVersion)</Version>
</PackageReference>
Expand Down Expand Up @@ -153,7 +151,9 @@
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
<CustomToolNamespace>Microsoft.NET.Build.Tasks</CustomToolNamespace>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Strings.*.resx">
<DependentUpon>Strings.resx</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="..\..\..\build\Targets\Signing.Imports.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Loading