Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 57518b93 编写于 作者: T Tanner Gooding
浏览文件
操作

Normalizing the *.*proj, *.props, and *.targets files to have consistent indentation

上级 794bfc10
隐藏空白更改
内联 并排
Showing with 136 addition and 581 deletion
BuildAndTest.proj
浏览文件 @ 57518b93
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
DefaultTargets="BuildAndTest"
>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="BuildAndTest">
<Import Project="$(MSBuildThisFileDirectory)build\Targets\Dependencies.props" />
......@@ -39,63 +36,35 @@
</PropertyGroup>
<Target Name="Build">
<MSBuild BuildInParallel="true"
Projects="$(RoslynSolution)"
Properties="$(MSBuildCommonProperties)"
Targets="Build"/>
<MSBuild BuildInParallel="true"
Condition="'$(ManualTest)' == ''"
Projects="$(SamplesSolution)"
Properties="$(MSBuildCommonProperties)"
Targets="Build"/>
<MSBuild BuildInParallel="true" Projects="$(RoslynSolution)" Properties="$(MSBuildCommonProperties)" Targets="Build" />
<MSBuild BuildInParallel="true" Condition="'$(ManualTest)' == ''" Projects="$(SamplesSolution)" Properties="$(MSBuildCommonProperties)" Targets="Build" />
</Target>
<Target Name="Clean">
<MSBuild BuildInParallel="true"
Projects="$(RoslynSolution)"
Properties="$(MSBuildCommonProperties)"
Targets="Clean"/>
<MSBuild BuildInParallel="true"
Condition="'$(ManualTest)' == ''"
Projects="$(SamplesSolution)"
Properties="$(MSBuildCommonProperties)"
Targets="Clean"/>
<MSBuild BuildInParallel="true" Projects="$(RoslynSolution)" Properties="$(MSBuildCommonProperties)" Targets="Clean" />
<MSBuild BuildInParallel="true" Condition="'$(ManualTest)' == ''" Projects="$(SamplesSolution)" Properties="$(MSBuildCommonProperties)" Targets="Clean" />
</Target>
<Target Name="Rebuild">
<MSBuild BuildInParallel="true"
Projects="$(RoslynSolution)"
Properties="$(MSBuildCommonProperties)"
Targets="Rebuild"/>
<MSBuild BuildInParallel="true"
Condition="'$(ManualTest)' == ''"
Projects="$(SamplesSolution)"
Properties="$(MSBuildCommonProperties)"
Targets="Rebuild"/>
<MSBuild BuildInParallel="true" Projects="$(RoslynSolution)" Properties="$(MSBuildCommonProperties)" Targets="Rebuild" />
<MSBuild BuildInParallel="true" Condition="'$(ManualTest)' == ''" Projects="$(SamplesSolution)" Properties="$(MSBuildCommonProperties)" Targets="Rebuild" />
</Target>
<Target Name="Test">
<ItemGroup>
<AssembliesToCopyLocal Include="$(NuGetPackageRoot)\xunit\$(xunitVersion)\*.dll
;$(NuGetPackageRoot)\xunit.assert\$(xunitassertVersion)\lib\portable-net45+netcore45+wp8+wpa81\*.dll" />
<AssembliesToCopyLocal Include="$(NuGetPackageRoot)\xunit\$(xunitVersion)\*.dll ;$(NuGetPackageRoot)\xunit.assert\$(xunitassertVersion)\lib\portable-net45+netcore45+wp8+wpa81\*.dll" />
</ItemGroup>
<!-- Copy xunit stuff to output directory -->
<Copy SourceFiles="@(AssembliesToCopyLocal)"
DestinationFolder="$(OutputDirectory)"
SkipUnchangedFiles="true"
UseHardlinksIfPossible="true" />
<Copy SourceFiles="@(AssembliesToCopyLocal)" DestinationFolder="$(OutputDirectory)" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />
<MakeDir Directories="$(CoreClrTestDirectory)\xUnitResults" />
<ItemGroup>
<!-- MakeConst unit tests tracked by https://github.com/dotnet/roslyn/issues/5918 -->
<TestAssemblies Condition="'$(Test64)' != 'true'"
Include="$(OutputDirectory)\UnitTests*\**\$(IncludePattern);" />
<TestAssemblies Condition="'$(Test64)' != 'true'" Include="$(OutputDirectory)\UnitTests*\**\$(IncludePattern);" />
<TestAssemblies Condition="'$(Test64)' == 'true'"
Include="$(OutputDirectory)\UnitTests*\**\$(IncludePattern);"
Exclude="$(OutputDirectory)\UnitTests*\**\Roslyn.Interactive*" />
<TestAssemblies Condition="'$(Test64)' == 'true'" Include="$(OutputDirectory)\UnitTests*\**\$(IncludePattern);" Exclude="$(OutputDirectory)\UnitTests*\**\Roslyn.Interactive*" />
<CoreTestAssemblies Include="$(CoreClrTestDirectory)\$(IncludePattern)" />
</ItemGroup>
......@@ -113,7 +82,6 @@
</Target>
<Target Name="BuildAndTest"
DependsOnTargets="Build;Test" />
<Target Name="BuildAndTest" DependsOnTargets="Build;Test" />
</Project>
\ No newline at end of file
build/NuGetAdditionalFiles/Microsoft.Net.Compilers.props
浏览文件 @ 57518b93
......@@ -10,19 +10,13 @@
the executable in the MSBuild install path will be executed. -->
<Target Name="ValidateMSBuildToolsVersion" Condition="'$(BuildingProject)' == 'true'">
<Error Text="Microsoft.Net.Compilers is only supported on MSBuild v14.0 and above"
Condition="'$(MSBuildToolsVersion)' == '2.0'
OR '$(MSBuildToolsVersion)' == '3.5'
OR '$(MSBuildToolsVersion)' == '4.0'
OR '$(MSBuildToolsVersion)' == '12.0'" />
<Error Text="Microsoft.Net.Compilers is only supported on MSBuild v14.0 and above" Condition="'$(MSBuildToolsVersion)' == '2.0' OR '$(MSBuildToolsVersion)' == '3.5' OR '$(MSBuildToolsVersion)' == '4.0' OR '$(MSBuildToolsVersion)' == '12.0'" />
</Target>
<!-- Always use the local build task, even if we just shell out to an exe in case there are
new properties in the local build task. -->
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Csc"
AssemblyFile="$(MSBuildThisFileDirectory)..\tools\Microsoft.Build.Tasks.CodeAnalysis.dll" />
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Vbc"
AssemblyFile="$(MSBuildThisFileDirectory)..\tools\Microsoft.Build.Tasks.CodeAnalysis.dll" />
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Csc" AssemblyFile="$(MSBuildThisFileDirectory)..\tools\Microsoft.Build.Tasks.CodeAnalysis.dll" />
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Vbc" AssemblyFile="$(MSBuildThisFileDirectory)..\tools\Microsoft.Build.Tasks.CodeAnalysis.dll" />
<PropertyGroup>
<!-- By default don't use the compiler server in Visual Studio. -->
<UseSharedCompilation Condition="'$(UseSharedCompilation)' == ''">false</UseSharedCompilation>
......
build/Targets/GenerateAssemblyInfo.targets
浏览文件 @ 57518b93
......@@ -94,23 +94,14 @@
<!-- Depends on PrepareForBuild because the latter is responsible for calling MakeDir(IntermediateOutputPath).
Without it, if we do a design-time build of a project (e.g. in Workspace.LoadSolution) immediately following
a tfpt treeclean, WriteCodeFragment may fail because the obj folder doesn't even exist at that time. -->
<Target Name="GenerateAssemblyInfoFile"
Inputs="$(MSBuildThisFileFullPath)"
Outputs="$(GeneratedAssemblyInfoFile)"
DependsOnTargets="PrepareForBuild"
Condition="('$(Language)' == 'C#' or '$(Language)' == 'VB')">
<Target Name="GenerateAssemblyInfoFile" Inputs="$(MSBuildThisFileFullPath)" Outputs="$(GeneratedAssemblyInfoFile)" DependsOnTargets="PrepareForBuild" Condition="('$(Language)' == 'C#' or '$(Language)' == 'VB')">
<CreateItem Include="System.Reflection.AssemblyMetadataAttribute"
AdditionalMetadata="_Parameter1=Serviceable;_Parameter2=True"
Condition="'$(ServiceablePackage)' == 'true'">
<CreateItem Include="System.Reflection.AssemblyMetadataAttribute" AdditionalMetadata="_Parameter1=Serviceable;_Parameter2=True" Condition="'$(ServiceablePackage)' == 'true'">
<Output TaskParameter="Include" ItemName="AssemblyVersionAttribute" />
</CreateItem>
<!-- The necessity of this Task is tracked by https://github.com/dotnet/roslyn/issues/8421 -->
<WriteCodeFragmentEx
AssemblyAttributes="@(AssemblyVersionAttribute)"
Language="$(Language)"
OutputFile="$(GeneratedAssemblyInfoFile)">
<WriteCodeFragmentEx AssemblyAttributes="@(AssemblyVersionAttribute)" Language="$(Language)" OutputFile="$(GeneratedAssemblyInfoFile)">
<Output TaskParameter="OutputFile" ItemName="Compile" />
<Output TaskParameter="OutputFile" ItemName="FileWrites" />
</WriteCodeFragmentEx>
......
build/Targets/GenerateCompilerInternals.targets
浏览文件 @ 57518b93
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
......@@ -48,124 +47,82 @@
</PropertyGroup>
<Target Name="MarkCoreRunExecutable" Condition="'$(OS)' != 'Windows_NT' And Exists('$(CoreRunExe)')">
<Exec Command='chmod +x "$(CoreRunExe)"' />
<Exec Command="chmod +x &quot;$(CoreRunExe)&quot;" />
</Target>
<Target
Name="GenerateSyntaxModel"
Inputs="$(SyntaxDefinition);$(VBSyntaxGeneratorToolPath);$(CSharpSyntaxGeneratorToolPath)"
Outputs="$(GeneratedSyntaxFileSyntax);$(GeneratedSyntaxFileMain);$(GeneratedSyntaxFileInternal)"
Condition="'$(SyntaxDefinition)' != '' AND '$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')"
>
<Target Name="GenerateSyntaxModel" Inputs="$(SyntaxDefinition);$(VBSyntaxGeneratorToolPath);$(CSharpSyntaxGeneratorToolPath)" Outputs="$(GeneratedSyntaxFileSyntax);$(GeneratedSyntaxFileMain);$(GeneratedSyntaxFileInternal)" Condition="'$(SyntaxDefinition)' != '' AND '$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')">
<PropertyGroup>
<SyntaxGenerator Condition="'$(Language)' == 'VB'">"$(CoreRunExe)" "$(VBSyntaxGeneratorToolPath)"</SyntaxGenerator>
<SyntaxGenerator Condition="'$(Language)' == 'C#'">"$(CoreRunExe)" "$(CSharpSyntaxGeneratorToolPath)"</SyntaxGenerator>
</PropertyGroup>
<Exec
Command='$(SyntaxGenerator) "$(SyntaxDefinition)" "$(IntermediateOutputPath)"'
Outputs="$(GeneratedSyntaxFileSyntax);$(GeneratedSyntaxFileMain);$(GeneratedSyntaxFileInternal)">
<Exec Command="$(SyntaxGenerator) &quot;$(SyntaxDefinition)&quot; &quot;$(IntermediateOutputPath)&quot;" Outputs="$(GeneratedSyntaxFileSyntax);$(GeneratedSyntaxFileMain);$(GeneratedSyntaxFileInternal)">
<Output TaskParameter="Outputs" ItemName="FileWrites" />
</Exec>
</Target>
<Target
Name="CleanSyntaxModel"
>
<Target Name="CleanSyntaxModel">
<Delete Files="$(GeneratedSyntaxFileSyntax)" />
<Delete Files="$(GeneratedSyntaxFileMain)" />
<Delete Files="$(GeneratedSyntaxFileInternal)" />
</Target>
<Target
Name="GenerateSyntaxModelGetText"
Inputs="@(SyntaxGetTextDefinition);$(VBSyntaxGeneratorToolPath)"
Outputs="@(SyntaxGetTextDefinition -> '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')"
Condition="'$(BuildingProject)' == 'true' AND '$(Language)' == 'VB'"
>
<Target Name="GenerateSyntaxModelGetText" Inputs="@(SyntaxGetTextDefinition);$(VBSyntaxGeneratorToolPath)" Outputs="@(SyntaxGetTextDefinition -&gt; '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')" Condition="'$(BuildingProject)' == 'true' AND '$(Language)' == 'VB'">
<PropertyGroup>
<SyntaxGenerator>"$(CoreRunExe)" "$(VBSyntaxGeneratorToolPath)"</SyntaxGenerator>
<GeneratedSyntaxModelGetText>@(SyntaxGetTextDefinition -> '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelGetText>
<GeneratedSyntaxModelGetText>@(SyntaxGetTextDefinition -&gt; '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelGetText>
</PropertyGroup>
<Exec
Command='$(SyntaxGenerator) &quot;@(SyntaxGetTextDefinition)&quot; &quot;$(GeneratedSyntaxModelGetText)&quot; /gettext'
Outputs="$(GeneratedSyntaxModelGetText)"
>
<Exec Command="$(SyntaxGenerator) &quot;@(SyntaxGetTextDefinition)&quot; &quot;$(GeneratedSyntaxModelGetText)&quot; /gettext" Outputs="$(GeneratedSyntaxModelGetText)">
<Output TaskParameter="Outputs" ItemName="FileWrites" />
</Exec>
</Target>
<Target
Name="CleanSyntaxModelGetText"
Condition="'$(Language)' == 'VB'"
>
<Target Name="CleanSyntaxModelGetText" Condition="'$(Language)' == 'VB'">
<PropertyGroup>
<GeneratedSyntaxModelGetText>@(SyntaxGetTextDefinition -> '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelGetText>
<GeneratedSyntaxModelGetText>@(SyntaxGetTextDefinition -&gt; '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelGetText>
</PropertyGroup>
<Delete Files="$(GeneratedSyntaxModelGetText)" />
</Target>
<Target
Name="GenerateSyntaxModelTests"
Inputs="@(SyntaxTestDefinition);$(VBSyntaxGeneratorToolPath);$(CSharpSyntaxGeneratorToolPath)"
Outputs="@(SyntaxTestDefinition -> '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')"
Condition="'@(SyntaxTestDefinition)' != '' AND '$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')"
>
<Target Name="GenerateSyntaxModelTests" Inputs="@(SyntaxTestDefinition);$(VBSyntaxGeneratorToolPath);$(CSharpSyntaxGeneratorToolPath)" Outputs="@(SyntaxTestDefinition -&gt; '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')" Condition="'@(SyntaxTestDefinition)' != '' AND '$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')">
<PropertyGroup>
<SyntaxGenerator Condition="'$(Language)' == 'VB'">"$(CoreRunExe)" "$(VBSyntaxGeneratorToolPath)"</SyntaxGenerator>
<SyntaxGenerator Condition="'$(Language)' == 'C#'">"$(CoreRunExe)" "$(CSharpSyntaxGeneratorToolPath)"</SyntaxGenerator>
<GeneratedSyntaxModelTests>@(SyntaxTestDefinition -> '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelTests>
<GeneratedSyntaxModelTests>@(SyntaxTestDefinition -&gt; '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelTests>
</PropertyGroup>
<Exec
Command='$(SyntaxGenerator) &quot;@(SyntaxTestDefinition)&quot; &quot;$(GeneratedSyntaxModelTests)&quot; /test'
Outputs="$(GeneratedSyntaxModelTests)"
>
<Exec Command="$(SyntaxGenerator) &quot;@(SyntaxTestDefinition)&quot; &quot;$(GeneratedSyntaxModelTests)&quot; /test" Outputs="$(GeneratedSyntaxModelTests)">
<Output TaskParameter="Outputs" ItemName="FileWrites" />
</Exec>
</Target>
<Target
Name="CleanSyntaxModelTests"
Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'"
>
<Target Name="CleanSyntaxModelTests" Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'">
<PropertyGroup>
<GeneratedSyntaxModelTests>@(SyntaxTestDefinition -> '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelTests>
<GeneratedSyntaxModelTests>@(SyntaxTestDefinition -&gt; '$(IntermediateOutputPath)\%(FileName)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedSyntaxModelTests>
</PropertyGroup>
<Delete Files="$(GeneratedSyntaxModelTests)" />
</Target>
<Target
Name="GenerateBoundTree"
Inputs="@(BoundTreeDefinition);$(BoundTreeGeneratorToolPath)"
Outputs="@(BoundTreeDefinition -> '$(IntermediateOutputPath)%(Filename)%(Extension).Generated$(DefaultLanguageSourceExtension)')"
Condition="'@(BoundTreeDefinition)' != '' AND '$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')"
>
<Target Name="GenerateBoundTree" Inputs="@(BoundTreeDefinition);$(BoundTreeGeneratorToolPath)" Outputs="@(BoundTreeDefinition -&gt; '$(IntermediateOutputPath)%(Filename)%(Extension).Generated$(DefaultLanguageSourceExtension)')" Condition="'@(BoundTreeDefinition)' != '' AND '$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')">
<PropertyGroup>
<BoundTreeGenerator>"$(CoreRunExe)" "$(BoundTreeGeneratorToolPath)"</BoundTreeGenerator>
<GeneratedBoundTree>@(BoundTreeDefinition -> '$(IntermediateOutputPath)%(Filename)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedBoundTree>
<GeneratedBoundTree>@(BoundTreeDefinition -&gt; '$(IntermediateOutputPath)%(Filename)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedBoundTree>
</PropertyGroup>
<Exec
Command='$(BoundTreeGenerator) $(Language) "@(BoundTreeDefinition)" "$(GeneratedBoundTree)"'
Outputs="$(GeneratedBoundTree)"
>
<Exec Command="$(BoundTreeGenerator) $(Language) &quot;@(BoundTreeDefinition)&quot; &quot;$(GeneratedBoundTree)&quot;" Outputs="$(GeneratedBoundTree)">
<Output TaskParameter="Outputs" ItemName="FileWrites" />
</Exec>
</Target>
<Target
Name="CleanBoundTree"
Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'"
>
<Target Name="CleanBoundTree" Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'">
<PropertyGroup>
<GeneratedBoundTree>@(BoundTreeDefinition -> '$(IntermediateOutputPath)%(Filename)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedBoundTree>
<GeneratedBoundTree>@(BoundTreeDefinition -&gt; '$(IntermediateOutputPath)%(Filename)%(Extension).Generated$(DefaultLanguageSourceExtension)')</GeneratedBoundTree>
</PropertyGroup>
<Delete Files="$(GeneratedBoundTree)" />
......@@ -177,32 +134,21 @@
</ErrorCode>
</ItemDefinitionGroup>
<Target
Name="GenerateErrorFacts"
Inputs="@(ErrorCode);$(CSharpErrorFactsGeneratorToolPath);$(VBErrorFactsGeneratorToolPath)"
Outputs="@(ErrorCode -> '$(IntermediateOutputPath)ErrorFacts.Generated$(DefaultLanguageSourceExtension)')"
Condition="'@(ErrorCode)' != '' AND '$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')"
>
<Target Name="GenerateErrorFacts" Inputs="@(ErrorCode);$(CSharpErrorFactsGeneratorToolPath);$(VBErrorFactsGeneratorToolPath)" Outputs="@(ErrorCode -&gt; '$(IntermediateOutputPath)ErrorFacts.Generated$(DefaultLanguageSourceExtension)')" Condition="'@(ErrorCode)' != '' AND '$(BuildingProject)' == 'true' AND ('$(Language)' == 'VB' or '$(Language)' == 'C#')">
<PropertyGroup>
<ErrorFactsGenerator Condition="'$(Language)' == 'VB'">"$(CoreRunExe)" "$(VBErrorFactsGeneratorToolPath)"</ErrorFactsGenerator>
<ErrorFactsGenerator Condition="'$(Language)' == 'C#'">"$(CoreRunExe)" "$(CSharpErrorFactsGeneratorToolPath)"</ErrorFactsGenerator>
<GeneratedErrorFacts>@(ErrorCode -> '$(IntermediateOutputPath)ErrorFacts.Generated$(DefaultLanguageSourceExtension)')</GeneratedErrorFacts>
<GeneratedErrorFacts>@(ErrorCode -&gt; '$(IntermediateOutputPath)ErrorFacts.Generated$(DefaultLanguageSourceExtension)')</GeneratedErrorFacts>
</PropertyGroup>
<Exec
Command='$(ErrorFactsGenerator) "@(ErrorCode)" "$(GeneratedErrorFacts)"'
Outputs="$(GeneratedErrorFacts)"
>
<Exec Command="$(ErrorFactsGenerator) &quot;@(ErrorCode)&quot; &quot;$(GeneratedErrorFacts)&quot;" Outputs="$(GeneratedErrorFacts)">
<Output TaskParameter="Outputs" ItemName="FileWrites" />
</Exec>
</Target>
<Target
Name="CleanErrorFacts"
Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'"
>
<Target Name="CleanErrorFacts" Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'">
<PropertyGroup>
<GeneratedErrorFacts>@(ErrorCode -> '$(IntermediateOutputPath)ErrorFacts.Generated$(DefaultLanguageSourceExtension)')</GeneratedErrorFacts>
<GeneratedErrorFacts>@(ErrorCode -&gt; '$(IntermediateOutputPath)ErrorFacts.Generated$(DefaultLanguageSourceExtension)')</GeneratedErrorFacts>
</PropertyGroup>
<Delete Files="$(GeneratedErrorFacts)" />
......
build/Targets/GenerateInternalsVisibleTo.targets
浏览文件 @ 57518b93
......@@ -45,11 +45,7 @@
<!-- Dependency on PrepareForBuild is necessary so that we don't accidentally get ordered before it.
We rely on PrepareForBuild to create the IntermediateOutputDirectory if it doesn't exist. -->
<Target Name="GenerateInternalsVisibleToFile"
Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFile)"
Outputs="$(GeneratedInternalsVisibleToFile)"
DependsOnTargets="PrepareForBuild"
Condition="'@(InternalsVisibleTo)' != '' OR '@(InternalsVisibleToTest)' != '' OR '@(InternalsVisibleToTypeScript)' != '' OR '@(InternalsVisibleToVisualStudio)' != '' OR '@(InternalsVisibleToFSharp)' != '' OR '@(InternalsVisibleToMoq)' != '' OR '@(InternalsVisibleToRazor)' != ''">
<Target Name="GenerateInternalsVisibleToFile" Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFile)" Outputs="$(GeneratedInternalsVisibleToFile)" DependsOnTargets="PrepareForBuild" Condition="'@(InternalsVisibleTo)' != '' OR '@(InternalsVisibleToTest)' != '' OR '@(InternalsVisibleToTypeScript)' != '' OR '@(InternalsVisibleToVisualStudio)' != '' OR '@(InternalsVisibleToFSharp)' != '' OR '@(InternalsVisibleToMoq)' != '' OR '@(InternalsVisibleToRazor)' != ''">
<!--
This is a slightly evil trick. What we have is a group of InternalsVisibleTo items which
......@@ -67,51 +63,32 @@
"Identity" metadata on each of our itemgroups, MSBuild batching will take effect and this task
will be invoked once for each InternalsVisibleTo item.
-->
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity)$(InternalsVisibleToSuffix)"
Condition="'@(InternalsVisibleTo)' != ''">
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity)$(InternalsVisibleToSuffix)" Condition="'@(InternalsVisibleTo)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleToTest.Identity)$(InternalsVisibleToTestSuffix)"
Condition="'@(InternalsVisibleToTest)' != ''">
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleToTest.Identity)$(InternalsVisibleToTestSuffix)" Condition="'@(InternalsVisibleToTest)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleToTypeScript.Identity), PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293"
Condition="'@(InternalsVisibleToTypeScript)' != ''">
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleToTypeScript.Identity), PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293" Condition="'@(InternalsVisibleToTypeScript)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleToVisualStudio.Identity), PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293"
Condition="'@(InternalsVisibleToVisualStudio)' != ''">
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleToVisualStudio.Identity), PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293" Condition="'@(InternalsVisibleToVisualStudio)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleToFSharp.Identity), PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293"
Condition="'@(InternalsVisibleToFSharp)' != ''">
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleToFSharp.Identity), PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293" Condition="'@(InternalsVisibleToFSharp)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleToMoq.Identity)$(InternalsVisibleToMoqSuffix)"
Condition="'@(InternalsVisibleToMoq)' != ''">
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleToMoq.Identity)$(InternalsVisibleToMoqSuffix)" Condition="'@(InternalsVisibleToMoq)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleToMonodevelop.Identity)$(InternalsVisibleToMonodevelopSuffix)"
Condition="'@(InternalsVisibleToMonodevelop)' != ''">
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleToMonodevelop.Identity)$(InternalsVisibleToMonodevelopSuffix)" Condition="'@(InternalsVisibleToMonodevelop)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleToRazor.Identity), PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb"
Condition="'@(InternalsVisibleToRazor)' != ''">
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleToRazor.Identity), PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb" Condition="'@(InternalsVisibleToRazor)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<!-- The necessity of this Task is tracked by https://github.com/dotnet/roslyn/issues/8421 -->
<WriteCodeFragmentEx
AssemblyAttributes="@(InternalsVisibleToAttribute)"
Language="$(Language)"
OutputFile="$(GeneratedInternalsVisibleToFile)">
<WriteCodeFragmentEx AssemblyAttributes="@(InternalsVisibleToAttribute)" Language="$(Language)" OutputFile="$(GeneratedInternalsVisibleToFile)">
<Output TaskParameter="OutputFile" ItemName="Compile" />
<Output TaskParameter="OutputFile" ItemName="FileWrites" />
</WriteCodeFragmentEx>
......
build/Targets/GetProjectsReferencingProjectJsonFiles.targets
浏览文件 @ 57518b93
......@@ -2,19 +2,16 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask TaskName="ProjectReferencesTask" AssemblyFile="$(NuGetTasksAssemblyPath)" Condition=" $(MSBuildThisFileExtension) == '.xproj' " />
<Target Name="_NuGet_GetProjectsReferencingProjectJsonInternal"
DependsOnTargets="_SplitProjectReferencesByFileExistence"
Returns="@(_ProjectReferencingProjectJsonFile)">
<Target Name="_NuGet_GetProjectsReferencingProjectJsonInternal" DependsOnTargets="_SplitProjectReferencesByFileExistence" Returns="@(_ProjectReferencingProjectJsonFile)">
<!-- Process xprojs with an external task to find xproj -> xproj references -->
<ProjectReferencesTask ProjectFile="$(MsBuildProjectFullPath)" Condition=" $(MSBuildThisFileExtension) == '.xproj' " >
<ProjectReferencesTask ProjectFile="$(MsBuildProjectFullPath)" Condition=" $(MSBuildThisFileExtension) == '.xproj' ">
<Output TaskParameter="ProjectClosureOutput" PropertyName="ProjectClosureOutput" />
</ProjectReferencesTask>
<ItemGroup>
<!-- Filter out project references that specify ReferenceOutputAssembly=false -->
<ValidProjectInputForNuGet Include="@(ProjectReference)"
Condition=" %(ProjectReference.ReferenceOutputAssembly) == '' OR %(ProjectReference.ReferenceOutputAssembly) == 'true' " />
<ValidProjectInputForNuGet Include="@(ProjectReference)" Condition=" %(ProjectReference.ReferenceOutputAssembly) == '' OR %(ProjectReference.ReferenceOutputAssembly) == 'true' " />
<!-- Include all xproj -> xproj -->
<ValidProjectInputForNuGet Include="$(ProjectClosureOutput)" />
</ItemGroup>
......@@ -29,25 +26,13 @@
<!-- These entries are added to the results file -->
<ItemGroup>
<_ProjectReferencingProjectJsonFile
Include="#:$(MSBuildProjectFullPath)"
Condition=" '$(NuGetWriteEntryPoint)' == 'true' " />
<_ProjectReferencingProjectJsonFile
Include="$(MsBuildProjectFullPath)|%(NuGetFullPathForOutput.Identity)" Condition=" %(NuGetFullPathForOutput.Identity) != '' " />
<_ProjectReferencingProjectJsonFile Include="#:$(MSBuildProjectFullPath)" Condition=" '$(NuGetWriteEntryPoint)' == 'true' " />
<_ProjectReferencingProjectJsonFile Include="$(MsBuildProjectFullPath)|%(NuGetFullPathForOutput.Identity)" Condition=" %(NuGetFullPathForOutput.Identity) != '' " />
</ItemGroup>
<MSBuild
Projects="@(ValidProjectInputForNuGet)"
Targets="_NuGet_GetProjectsReferencingProjectJsonInternal"
Properties="
%(_MSBuildProjectReferenceExistent.SetConfiguration);
%(_MSBuildProjectReferenceExistent.SetPlatform);
NuGetWriteEntryPoint=false"
RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove)">
<MSBuild Projects="@(ValidProjectInputForNuGet)" Targets="_NuGet_GetProjectsReferencingProjectJsonInternal" Properties=" %(_MSBuildProjectReferenceExistent.SetConfiguration); %(_MSBuildProjectReferenceExistent.SetPlatform); NuGetWriteEntryPoint=false" RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove)">
<Output
TaskParameter="TargetOutputs"
ItemName="_ProjectReferencingProjectJsonFile" />
<Output TaskParameter="TargetOutputs" ItemName="_ProjectReferencingProjectJsonFile" />
</MSBuild>
</Target>
</Project>
\ No newline at end of file
build/Targets/GetProjectsReferencingProjectJsonFilesEntryPoint.targets
浏览文件 @ 57518b93
......@@ -5,25 +5,11 @@
<ItemGroup>
<NuGet_ProjectReferenceToResolveItems Include="$(NuGet_ProjectReferenceToResolve)" />
</ItemGroup>
<MsBuild
Projects="@(NuGet_ProjectReferenceToResolveItems)"
Targets="_NuGet_GetProjectsReferencingProjectJsonInternal"
BuildInParallel="false"
Properties="
%(_MSBuildProjectReferenceExistent.SetConfiguration);
%(_MSBuildProjectReferenceExistent.SetPlatform);
CustomAfterMicrosoftCommonTargets=$(NuGetCustomAfterBuildTargetPath);
NuGetWriteEntryPoint=true"
RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove)">
<MsBuild Projects="@(NuGet_ProjectReferenceToResolveItems)" Targets="_NuGet_GetProjectsReferencingProjectJsonInternal" BuildInParallel="false" Properties=" %(_MSBuildProjectReferenceExistent.SetConfiguration); %(_MSBuildProjectReferenceExistent.SetPlatform); CustomAfterMicrosoftCommonTargets=$(NuGetCustomAfterBuildTargetPath); NuGetWriteEntryPoint=true" RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove)">
<Output
TaskParameter="TargetOutputs"
ItemName="_ProjectReferencingProjectJsonFile" />
<Output TaskParameter="TargetOutputs" ItemName="_ProjectReferencingProjectJsonFile" />
</MsBuild>
<WriteLinesToFile
File="$(ResultsFile)"
Lines="@(_ProjectReferencingProjectJsonFile)"
Overwrite="true" />
<WriteLinesToFile File="$(ResultsFile)" Lines="@(_ProjectReferencingProjectJsonFile)" Overwrite="true" />
</Target>
</Project>
\ No newline at end of file
build/Targets/Imports.targets
浏览文件 @ 57518b93
......@@ -34,8 +34,8 @@
https://github.com/Microsoft/msbuild/issues/1499 -->
<PropertyGroup>
<_CopyReferences>$(DeveloperBuild></_CopyReferences>
<_CopyProjectReferences>$(DeveloperBuild></_CopyProjectReferences>
<_CopyReferences>$(DeveloperBuild&gt;</_CopyReferences>
<_CopyProjectReferences>$(DeveloperBuild&gt;</_CopyProjectReferences>
<_IsAnyUnitTest>true</_IsAnyUnitTest>
<_IsAnyPortableUnitTest>true</_IsAnyPortableUnitTest>
<CopyNuGetImplementations>false</CopyNuGetImplementations>
......@@ -227,8 +227,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.NuGet.targets" Condition="'$(OS)' != 'Windows_NT'" />
<!-- The portable v5.0 framework is delivered over NuGet, so std resolution should be disabled -->
<Import Project="DisableStandardFrameworkResolution.targets"
Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable' AND '$(TargetFrameworkVersion)' == 'v5.0'" />
<Import Project="DisableStandardFrameworkResolution.targets" Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable' AND '$(TargetFrameworkVersion)' == 'v5.0'" />
<Choose>
<When Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable' AND '$(TargetFrameworkVersion)' == 'v5.0'">
......@@ -293,9 +292,7 @@
<NuGetPackageToIncludeInVsix>%(NuGetPackageToIncludeInVsix.Identity)</NuGetPackageToIncludeInVsix>
</_ReferenceCopyLocalPathsWithPotentialInclusions>
<VSIXCopyLocalReferenceSourceItem Include="@(_ReferenceCopyLocalPathsWithPotentialInclusions)"
Condition="'%(_ReferenceCopyLocalPathsWithPotentialInclusions.NuGetPackageId)' == '%(_ReferenceCopyLocalPathsWithPotentialInclusions.NuGetPackageToIncludeInVsix)' and
'%(_ReferenceCopyLocalPathsWithPotentialInclusions.Extension)' != '.pdb'">
<VSIXCopyLocalReferenceSourceItem Include="@(_ReferenceCopyLocalPathsWithPotentialInclusions)" Condition="'%(_ReferenceCopyLocalPathsWithPotentialInclusions.NuGetPackageId)' == '%(_ReferenceCopyLocalPathsWithPotentialInclusions.NuGetPackageToIncludeInVsix)' and '%(_ReferenceCopyLocalPathsWithPotentialInclusions.Extension)' != '.pdb'">
<ForceIncludeInVsix>true</ForceIncludeInVsix>
<Private>true</Private>
</VSIXCopyLocalReferenceSourceItem>
......@@ -313,19 +310,7 @@
strange since we actually _implement_ DTE and use it as an exchange type with generics in a few places. -->
<Target Name="LinkVSSDKEmbeddableAssemblies" DependsOnTargets="ResolveReferences" AfterTargets="ResolveReferences">
<ItemGroup>
<ReferencePath Condition="
'%(FileName)' == 'Microsoft.VisualStudio.Shell.Embeddable'
or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.12.0'
or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime'
or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime'
or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime'
or '%(Filename)' == 'Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime'
or '%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime'
or '%(FileName)' == 'Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime'
or '%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.Interop'
or '%(FileName)' == 'stdole'
or '%(FileName)' == 'Microsoft.VisualStudio.CommandBars'
">
<ReferencePath Condition=" '%(FileName)' == 'Microsoft.VisualStudio.Shell.Embeddable' or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.12.0' or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime' or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime' or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime' or '%(Filename)' == 'Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime' or '%(FileName)' == 'Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime' or '%(FileName)' == 'Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime' or '%(FileName)' == 'Microsoft.VisualStudio.ProjectSystem.Interop' or '%(FileName)' == 'stdole' or '%(FileName)' == 'Microsoft.VisualStudio.CommandBars' ">
<EmbedInteropTypes>true</EmbedInteropTypes>
</ReferencePath>
</ItemGroup>
......@@ -367,10 +352,8 @@
<OptimizationDataFile>$([System.IO.Path]::GetFullPath('$(OptimizationDataFolderPath)\$(TargetName).pgo'))</OptimizationDataFile>
</PropertyGroup>
<Target Name="RestoreToolsetCheck"
Condition="'$(BuildingProject)' == 'true'">
<Error Text="Toolset packages have not been restored, run Restore.cmd before building"
Condition="!Exists('$(ToolsetCompilerPropsFilePath)')" />
<Target Name="RestoreToolsetCheck" Condition="'$(BuildingProject)' == 'true'">
<Error Text="Toolset packages have not been restored, run Restore.cmd before building" Condition="!Exists('$(ToolsetCompilerPropsFilePath)')" />
</Target>
<Target Name="CheckBootstrapState" Condition="'$(BootstrapBuildPath)' != ''" AfterTargets="CoreCompile">
......@@ -383,17 +366,10 @@
by our test scripts
-->
<Target Name="CopyDeterministicBuildDiagnosticFile" Condition="'$(DebugDeterminism)' != ''" AfterTargets="CoreCompile">
<Copy
Condition="Exists(@(IntermediateAssembly -> '%(fullpath).key'))"
SourceFiles="@(IntermediateAssembly -> '%(fullpath).key')"
DestinationFolder="$(OutDir)" />
<Copy Condition="Exists(@(IntermediateAssembly -&gt; '%(fullpath).key'))" SourceFiles="@(IntermediateAssembly -&gt; '%(fullpath).key')" DestinationFolder="$(OutDir)" />
</Target>
<Target Name="PostCompileBinaryModification"
AfterTargets="CoreCompile"
DependsOnTargets="ApplyOptimizations"
Inputs="@(IntermediateAssembly)"
Outputs="@(IntermediateAssembly);$(PostCompileBinaryModificationSentinelFile)">
<Target Name="PostCompileBinaryModification" AfterTargets="CoreCompile" DependsOnTargets="ApplyOptimizations" Inputs="@(IntermediateAssembly)" Outputs="@(IntermediateAssembly);$(PostCompileBinaryModificationSentinelFile)">
<!-- Write out a sentinel timestamp file to prevent unnecessary work in incremental builds. -->
<Touch AlwaysCreate="true" Files="$(PostCompileBinaryModificationSentinelFile)" />
......@@ -404,10 +380,7 @@
</Target>
<!-- Support for rolling optimization data into assemblies. -->
<Target Name="ForceGenerationOfBindingRedirects"
AfterTargets="ResolveAssemblyReferences"
BeforeTargets="GenerateBindingRedirects"
Condition="'$(ForceGenerationOfBindingRedirects)' == 'true'">
<Target Name="ForceGenerationOfBindingRedirects" AfterTargets="ResolveAssemblyReferences" BeforeTargets="GenerateBindingRedirects" Condition="'$(ForceGenerationOfBindingRedirects)' == 'true'">
<PropertyGroup>
<!-- Needs to be set in a target because it has to be set after the initial evaluation in the common targets -->
......@@ -417,14 +390,10 @@
<!-- The path to IBCMerge.exe must be specified at build time via $(IbcMergePath). Typically this is passed as a
build definition variable -->
<Target Name="ApplyOptimizations"
Condition="'$(OfficialBuild)' == 'true' AND '$(NonShipping)' != 'true' AND '$(SkipApplyOptimizations)' != 'true' AND Exists('$(OptimizationDataFile)') AND Exists('$(IbcMergePath)')"
Inputs="@(IntermediateAssembly)"
Outputs="@(IntermediateAssembly);$(PostCompileBinaryModificationSentinelFile)">
<Target Name="ApplyOptimizations" Condition="'$(OfficialBuild)' == 'true' AND '$(NonShipping)' != 'true' AND '$(SkipApplyOptimizations)' != 'true' AND Exists('$(OptimizationDataFile)') AND Exists('$(IbcMergePath)')" Inputs="@(IntermediateAssembly)" Outputs="@(IntermediateAssembly);$(PostCompileBinaryModificationSentinelFile)">
<Message Text="Adding optimization data to @(IntermediateAssembly)" />
<Exec Command="&quot;$(IbcMergePath)&quot; -q -f -partialNGEN -minify -mo &quot;@(IntermediateAssembly)&quot; -incremental &quot;$(OptimizationDataFile)&quot;"
ConsoleToMSBuild="true">
<Exec Command="&quot;$(IbcMergePath)&quot; -q -f -partialNGEN -minify -mo &quot;@(IntermediateAssembly)&quot; -incremental &quot;$(OptimizationDataFile)&quot;" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="IbcMergeOutput" />
</Exec>
<Message Text="$(IbcMergeOutput)" />
......@@ -438,15 +407,8 @@
This bug tracks getting an official solution out of MSBuild.
https://github.com/Microsoft/msbuild/issues/1499 -->
<Target Name="DeployPortableOnDeveloperBuild"
Condition="'$(_IsAnyPortableUnitTest)' == 'true' and '$(DeveloperBuild)' == 'true' and '$(OS)' == 'Windows_NT'">
<ResolveNuGetPackageAssets
IncludeFrameworkReferences="true"
NuGetPackagesDirectory="$(NuGetPackageRoot)"
RuntimeIdentifier="win7"
ProjectLanguage="$(ProjectLanguage)"
ProjectLockFile="$(MSBuildThisFileDirectory)..\..\src\Test\DeployDesktopTestRuntime\project.lock.json"
TargetMonikers=".NETFramework,Version=v4.6">
<Target Name="DeployPortableOnDeveloperBuild" Condition="'$(_IsAnyPortableUnitTest)' == 'true' and '$(DeveloperBuild)' == 'true' and '$(OS)' == 'Windows_NT'">
<ResolveNuGetPackageAssets IncludeFrameworkReferences="true" NuGetPackagesDirectory="$(NuGetPackageRoot)" RuntimeIdentifier="win7" ProjectLanguage="$(ProjectLanguage)" ProjectLockFile="$(MSBuildThisFileDirectory)..\..\src\Test\DeployDesktopTestRuntime\project.lock.json" TargetMonikers=".NETFramework,Version=v4.6">
<Output TaskParameter="ResolvedCopyLocalItems" ItemName="ReferenceCopyLocalPaths" />
</ResolveNuGetPackageAssets>
......
build/Targets/Microsoft.Net.Compilers.props
浏览文件 @ 57518b93
......@@ -8,12 +8,8 @@
<!-- Always use the local build task, even if we just shell out to an exe in case there are
new properties in the local build task. -->
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Csc"
AssemblyFile="$(ToolsetCompilerPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
/>
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Vbc"
AssemblyFile="$(ToolsetCompilerPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
/>
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Csc" AssemblyFile="$(ToolsetCompilerPath)\Microsoft.Build.Tasks.CodeAnalysis.dll" />
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Vbc" AssemblyFile="$(ToolsetCompilerPath)\Microsoft.Build.Tasks.CodeAnalysis.dll" />
<PropertyGroup>
<CSharpCoreTargetsPath>$(ToolsetCompilerPath)\Microsoft.CSharp.Core.targets</CSharpCoreTargetsPath>
<VisualBasicCoreTargetsPath>$(ToolsetCompilerPath)\Microsoft.VisualBasic.Core.targets</VisualBasicCoreTargetsPath>
......
build/Targets/Roslyn.Toolsets.Xunit.targets
浏览文件 @ 57518b93
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<XUnitPath>$(NuGetPackageRoot)\xunit.runner.console\$(xunitrunnerconsoleVersion)\tools\xunit.console.x86.exe</XUnitPath>
......
build/Targets/Settings.props
浏览文件 @ 57518b93
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="Versions.props"/>
<Import Project="Versions.props" />
<PropertyGroup>
<JenkinsBuild>false</JenkinsBuild>
......@@ -191,15 +191,9 @@
<!-- During bootstrap builds it's important to load our bootstrap tasks before doing any
other imports (which could load a same named DLL) -->
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Csc"
AssemblyFile="$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition="'$(BootstrapBuildPath)' != ''" />
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Vbc"
AssemblyFile="$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition="'$(BootstrapBuildPath)' != ''" />
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.ValidateBootstrap"
AssemblyFile="$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition="'$(BootstrapBuildPath)' != ''" />
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Csc" AssemblyFile="$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll" Condition="'$(BootstrapBuildPath)' != ''" />
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Vbc" AssemblyFile="$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll" Condition="'$(BootstrapBuildPath)' != ''" />
<UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.ValidateBootstrap" AssemblyFile="$(BootstrapBuildPath)\Microsoft.Build.Tasks.CodeAnalysis.dll" Condition="'$(BootstrapBuildPath)' != ''" />
<!--
Roslyn uses the WriteCodeFragment task to output generated assembly attributes. In MSBuild 14.0 update 1 this task
......@@ -212,8 +206,7 @@
<UsingTask TaskName="Roslyn.MSBuild.Util.WriteCodeFragmentEx" AssemblyFile="$(RoslynBuildUtilFilePath)" />
<!-- This file is imported by all projects at the beginning of the project files -->
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props') AND '$(MSBuildProjectExtension)' != '.vcxproj'" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props') AND '$(MSBuildProjectExtension)' != '.vcxproj'" />
<Import Project="$(RoslynDiagnosticsPropsFilePath)" Condition="'$(UseRoslynAnalyzers)' == 'true'" />
......
src/Compilers/Core/AnalyzerDriver/AnalyzerDriver.shproj
浏览文件 @ 57518b93
......@@ -5,19 +5,11 @@
<ProjectGuid>d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props')" />
<Import
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props')" />
<PropertyGroup />
<Import Project="AnalyzerDriver.projitems" Label="Shared" />
<Import
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets')" />
</Project>
\ No newline at end of file
src/Compilers/Core/CommandLine/CommandLine.shproj
浏览文件 @ 57518b93
......@@ -5,18 +5,10 @@
<ProjectGuid>ad6f474e-e6d4-4217-91f3-b7af1be31ccc</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props')" />
<Import
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props')" />
<PropertyGroup />
<Import Project="CommandLine.projitems" Label="Shared" />
<Import
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets')" />
</Project>
\ No newline at end of file
src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
浏览文件 @ 57518b93
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target
Name="CoreCompile"
Inputs="$(MSBuildAllProjects);
@(Compile);
@(_CoreCompileResourceInputs);
$(ApplicationIcon);
$(AssemblyOriginatorKeyFile);
@(ReferencePath);
@(CompiledLicenseFile);
@(LinkResource);
@(EmbeddedDocumentation);
$(Win32Resource);
$(Win32Manifest);
@(CustomAdditionalCompileInputs);
$(ResolvedCodeAnalysisRuleSet);
@(AdditionalFiles);
@(EmbeddedFiles)"
Outputs="@(DocFileItem);
@(IntermediateAssembly);
@(_DebugSymbolsIntermediatePath);
$(NonExistentFile);
@(CustomAdditionalCompileOutputs)"
Returns="@(CscCommandLineArgs)"
DependsOnTargets="$(CoreCompileDependsOn)"
>
<Target Name="CoreCompile" Inputs="$(MSBuildAllProjects); @(Compile); @(_CoreCompileResourceInputs); $(ApplicationIcon); $(AssemblyOriginatorKeyFile); @(ReferencePath); @(CompiledLicenseFile); @(LinkResource); @(EmbeddedDocumentation); $(Win32Resource); $(Win32Manifest); @(CustomAdditionalCompileInputs); $(ResolvedCodeAnalysisRuleSet); @(AdditionalFiles); @(EmbeddedFiles)" Outputs="@(DocFileItem); @(IntermediateAssembly); @(_DebugSymbolsIntermediatePath); $(NonExistentFile); @(CustomAdditionalCompileOutputs)" Returns="@(CscCommandLineArgs)" DependsOnTargets="$(CoreCompileDependsOn)">
<!-- These two compiler warnings are raised when a reference is bound to a different version
than specified in the assembly reference version number. MSBuild raises the same warning in this case,
so the compiler warning would be redundant. -->
......@@ -35,12 +11,12 @@
<PropertyGroup>
<!-- To match historical behavior, when inside VS11+ disable the warning from csc.exe indicating that no sources were passed in-->
<NoWarn Condition=" '$(BuildingInsideVisualStudio)' == 'true' and '$(VisualStudioVersion)' != '' and '$(VisualStudioVersion)' > '10.0' ">$(NoWarn);2008</NoWarn>
<NoWarn Condition=" '$(BuildingInsideVisualStudio)' == 'true' and '$(VisualStudioVersion)' != '' and '$(VisualStudioVersion)' &gt; '10.0' ">$(NoWarn);2008</NoWarn>
</PropertyGroup>
<ItemGroup Condition="'$(TargetingClr2Framework)'=='true'">
<ReferencePath>
<EmbedInteropTypes/>
<EmbedInteropTypes />
</ReferencePath>
</ItemGroup>
......@@ -70,78 +46,7 @@
</PropertyGroup>
<!-- Condition is to filter out the _CoreCompileResourceInputs so that it doesn't pass in culture resources to the compiler -->
<Csc Condition=" '%(_CoreCompileResourceInputs.WithCulture)' != 'true' "
AdditionalLibPaths="$(AdditionalLibPaths)"
AddModules="@(AddModules)"
AdditionalFiles="@(AdditionalFiles)"
AllowUnsafeBlocks="$(AllowUnsafeBlocks)"
Analyzers="@(Analyzer)"
ApplicationConfiguration="$(AppConfigForCompiler)"
BaseAddress="$(BaseAddress)"
CheckForOverflowUnderflow="$(CheckForOverflowUnderflow)"
ChecksumAlgorithm="$(ChecksumAlgorithm)"
CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
CodePage="$(CodePage)"
DebugType="$(DebugType)"
DefineConstants="$(DefineConstants)"
DelaySign="$(DelaySign)"
DisabledWarnings="$(NoWarn)"
DocumentationFile="@(DocFileItem)"
EmbeddedFiles="@(EmbeddedFiles)"
EmitDebugInformation="$(DebugSymbols)"
EnvironmentVariables="$(CscEnvironment)"
ErrorEndLocation="$(ErrorEndLocation)"
ErrorLog="$(ErrorLog)"
ErrorReport="$(ErrorReport)"
Features="$(Features)"
FileAlignment="$(FileAlignment)"
GenerateFullPaths="$(GenerateFullPaths)"
HighEntropyVA="$(HighEntropyVA)"
Instrument="$(Instrument)"
KeyContainer="$(KeyContainerName)"
KeyFile="$(KeyOriginatorFile)"
LangVersion="$(LangVersion)"
LinkResources="@(LinkResource)"
MainEntryPoint="$(StartupObject)"
ModuleAssemblyName="$(ModuleAssemblyName)"
NoConfig="true"
NoLogo="$(NoLogo)"
NoStandardLib="$(NoCompilerStandardLib)"
NoWin32Manifest="$(NoWin32Manifest)"
Optimize="$(Optimize)"
Deterministic="$(Deterministic)"
PublicSign="$(PublicSign)"
OutputAssembly="@(IntermediateAssembly)"
PdbFile="$(PdbFile)"
Platform="$(PlatformTarget)"
Prefer32Bit="$(Prefer32Bit)"
PreferredUILang="$(PreferredUILang)"
ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
References="@(ReferencePath)"
ReportAnalyzer="$(ReportAnalyzer)"
Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)"
ResponseFiles="$(CompilerResponseFile)"
RuntimeMetadataVersion="$(RuntimeMetadataVersion)"
SkipCompilerExecution="$(SkipCompilerExecution)"
Sources="@(Compile)"
SubsystemVersion="$(SubsystemVersion)"
TargetType="$(OutputType)"
ToolExe="$(CscToolExe)"
ToolPath="$(CscToolPath)"
TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)"
UseSharedCompilation="$(UseSharedCompilation)"
Utf8Output="$(Utf8Output)"
VsSessionGuid="$(VsSessionGuid)"
WarningLevel="$(WarningLevel)"
WarningsAsErrors="$(WarningsAsErrors)"
WarningsNotAsErrors="$(WarningsNotAsErrors)"
Win32Icon="$(ApplicationIcon)"
Win32Manifest="$(Win32Manifest)"
Win32Resource="$(Win32Resource)"
PathMap="$(PathMap)"
SourceLink="$(SourceLink)"
>
<Csc Condition=" '%(_CoreCompileResourceInputs.WithCulture)' != 'true' " AdditionalLibPaths="$(AdditionalLibPaths)" AddModules="@(AddModules)" AdditionalFiles="@(AdditionalFiles)" AllowUnsafeBlocks="$(AllowUnsafeBlocks)" Analyzers="@(Analyzer)" ApplicationConfiguration="$(AppConfigForCompiler)" BaseAddress="$(BaseAddress)" CheckForOverflowUnderflow="$(CheckForOverflowUnderflow)" ChecksumAlgorithm="$(ChecksumAlgorithm)" CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)" CodePage="$(CodePage)" DebugType="$(DebugType)" DefineConstants="$(DefineConstants)" DelaySign="$(DelaySign)" DisabledWarnings="$(NoWarn)" DocumentationFile="@(DocFileItem)" EmbeddedFiles="@(EmbeddedFiles)" EmitDebugInformation="$(DebugSymbols)" EnvironmentVariables="$(CscEnvironment)" ErrorEndLocation="$(ErrorEndLocation)" ErrorLog="$(ErrorLog)" ErrorReport="$(ErrorReport)" Features="$(Features)" FileAlignment="$(FileAlignment)" GenerateFullPaths="$(GenerateFullPaths)" HighEntropyVA="$(HighEntropyVA)" Instrument="$(Instrument)" KeyContainer="$(KeyContainerName)" KeyFile="$(KeyOriginatorFile)" LangVersion="$(LangVersion)" LinkResources="@(LinkResource)" MainEntryPoint="$(StartupObject)" ModuleAssemblyName="$(ModuleAssemblyName)" NoConfig="true" NoLogo="$(NoLogo)" NoStandardLib="$(NoCompilerStandardLib)" NoWin32Manifest="$(NoWin32Manifest)" Optimize="$(Optimize)" Deterministic="$(Deterministic)" PublicSign="$(PublicSign)" OutputAssembly="@(IntermediateAssembly)" PdbFile="$(PdbFile)" Platform="$(PlatformTarget)" Prefer32Bit="$(Prefer32Bit)" PreferredUILang="$(PreferredUILang)" ProvideCommandLineArgs="$(ProvideCommandLineArgs)" References="@(ReferencePath)" ReportAnalyzer="$(ReportAnalyzer)" Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)" ResponseFiles="$(CompilerResponseFile)" RuntimeMetadataVersion="$(RuntimeMetadataVersion)" SkipCompilerExecution="$(SkipCompilerExecution)" Sources="@(Compile)" SubsystemVersion="$(SubsystemVersion)" TargetType="$(OutputType)" ToolExe="$(CscToolExe)" ToolPath="$(CscToolPath)" TreatWarningsAsErrors="$(TreatWarningsAsErrors)" UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)" UseSharedCompilation="$(UseSharedCompilation)" Utf8Output="$(Utf8Output)" VsSessionGuid="$(VsSessionGuid)" WarningLevel="$(WarningLevel)" WarningsAsErrors="$(WarningsAsErrors)" WarningsNotAsErrors="$(WarningsNotAsErrors)" Win32Icon="$(ApplicationIcon)" Win32Manifest="$(Win32Manifest)" Win32Resource="$(Win32Resource)" PathMap="$(PathMap)" SourceLink="$(SourceLink)">
<Output TaskParameter="CommandLineArgs" ItemName="CscCommandLineArgs" />
</Csc>
......@@ -149,6 +54,6 @@
<_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
</ItemGroup>
<CallTarget Targets="$(TargetsTriggeredByCompilation)" Condition="'$(TargetsTriggeredByCompilation)' != ''"/>
<CallTarget Targets="$(TargetsTriggeredByCompilation)" Condition="'$(TargetsTriggeredByCompilation)' != ''" />
</Target>
</Project>
\ No newline at end of file
src/Compilers/Core/MSBuildTask/Microsoft.VisualBasic.Core.targets
浏览文件 @ 57518b93
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target
Name="CoreCompile"
Inputs="$(MSBuildAllProjects);
@(Compile);
@(_CoreCompileResourceInputs);
$(ApplicationIcon);
$(AssemblyOriginatorKeyFile);
@(ReferencePath);
@(CompiledLicenseFile);
@(LinkResource);
@(EmbeddedDocumentation);
$(Win32Resource);
$(Win32Manifest);
@(CustomAdditionalCompileInputs);
$(ResolvedCodeAnalysisRuleSet);
@(AdditionalFiles);
@(EmbeddedFiles)"
Outputs="@(DocFileItem);
@(IntermediateAssembly);
@(_DebugSymbolsIntermediatePath);
$(NonExistentFile);
@(CustomAdditionalCompileOutputs)"
Returns="@(VbcCommandLineArgs)"
DependsOnTargets="$(CoreCompileDependsOn)"
>
<Target Name="CoreCompile" Inputs="$(MSBuildAllProjects); @(Compile); @(_CoreCompileResourceInputs); $(ApplicationIcon); $(AssemblyOriginatorKeyFile); @(ReferencePath); @(CompiledLicenseFile); @(LinkResource); @(EmbeddedDocumentation); $(Win32Resource); $(Win32Manifest); @(CustomAdditionalCompileInputs); $(ResolvedCodeAnalysisRuleSet); @(AdditionalFiles); @(EmbeddedFiles)" Outputs="@(DocFileItem); @(IntermediateAssembly); @(_DebugSymbolsIntermediatePath); $(NonExistentFile); @(CustomAdditionalCompileOutputs)" Returns="@(VbcCommandLineArgs)" DependsOnTargets="$(CoreCompileDependsOn)">
<PropertyGroup>
<_NoWarnings Condition=" '$(WarningLevel)' == '0' ">true</_NoWarnings>
<_NoWarnings Condition=" '$(WarningLevel)' == '1' ">false</_NoWarnings>
......@@ -38,7 +14,7 @@
<ItemGroup Condition="'$(TargetingClr2Framework)'=='true'">
<ReferencePath>
<EmbedInteropTypes/>
<EmbedInteropTypes />
</ReferencePath>
</ItemGroup>
......@@ -59,93 +35,13 @@
</PropertyGroup>
<!-- Condition is to filter out the _CoreCompileResourceInputs so that it doesn't pass in culture resources to the compiler -->
<Vbc Condition=" '%(_CoreCompileResourceInputs.WithCulture)' != 'true' "
AdditionalLibPaths="$(AdditionalLibPaths)"
AddModules="@(AddModules)"
AdditionalFiles="@(AdditionalFiles)"
Analyzers="@(Analyzer)"
BaseAddress="$(BaseAddress)"
ChecksumAlgorithm="$(ChecksumAlgorithm)"
CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
CodePage="$(CodePage)"
DebugType="$(DebugType)"
DefineConstants="$(FinalDefineConstants)"
DelaySign="$(DelaySign)"
DisabledWarnings="$(NoWarn)"
DocumentationFile="@(DocFileItem)"
EmbeddedFiles="@(EmbeddedFiles)"
EmitDebugInformation="$(DebugSymbols)"
EnvironmentVariables="$(VbcEnvironment)"
ErrorLog="$(ErrorLog)"
ErrorReport="$(ErrorReport)"
Features="$(Features)"
FileAlignment="$(FileAlignment)"
GenerateDocumentation="$(GenerateDocumentation)"
HighEntropyVA="$(HighEntropyVA)"
Imports="@(Import)"
Instrument="$(Instrument)"
KeyContainer="$(KeyContainerName)"
KeyFile="$(KeyOriginatorFile)"
LangVersion="$(LangVersion)"
LinkResources="@(LinkResource)"
MainEntryPoint="$(StartupObject)"
ModuleAssemblyName="$(ModuleAssemblyName)"
NoConfig="true"
NoStandardLib="$(NoCompilerStandardLib)"
NoVBRuntimeReference="$(NoVBRuntimeReference)"
NoWarnings="$(_NoWarnings)"
NoWin32Manifest="$(NoWin32Manifest)"
Optimize="$(Optimize)"
Deterministic="$(Deterministic)"
PublicSign="$(PublicSign)"
OptionCompare="$(OptionCompare)"
OptionExplicit="$(OptionExplicit)"
OptionInfer="$(OptionInfer)"
OptionStrict="$(OptionStrict)"
OptionStrictType="$(OptionStrictType)"
OutputAssembly="@(IntermediateAssembly)"
PdbFile="$(PdbFile)"
Platform="$(PlatformTarget)"
Prefer32Bit="$(Prefer32Bit)"
PreferredUILang="$(PreferredUILang)"
ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
References="@(ReferencePath)"
RemoveIntegerChecks="$(RemoveIntegerChecks)"
ReportAnalyzer="$(ReportAnalyzer)"
Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)"
ResponseFiles="$(CompilerResponseFile)"
RootNamespace="$(RootNamespace)"
RuntimeMetadataVersion="$(RuntimeMetadataVersion)"
SdkPath="$(FrameworkPathOverride)"
SkipCompilerExecution="$(SkipCompilerExecution)"
Sources="@(Compile)"
SubsystemVersion="$(SubsystemVersion)"
TargetCompactFramework="$(TargetCompactFramework)"
TargetType="$(OutputType)"
ToolExe="$(VbcToolExe)"
ToolPath="$(VbcToolPath)"
TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)"
UseSharedCompilation="$(UseSharedCompilation)"
Utf8Output="$(Utf8Output)"
VBRuntimePath="$(VBRuntimePath)"
Verbosity="$(VbcVerbosity)"
VsSessionGuid="$(VsSessionGuid)"
WarningsAsErrors="$(WarningsAsErrors)"
WarningsNotAsErrors="$(WarningsNotAsErrors)"
Win32Icon="$(ApplicationIcon)"
Win32Manifest="$(Win32Manifest)"
Win32Resource="$(Win32Resource)"
VBRuntime="$(VBRuntime)"
PathMap="$(PathMap)"
SourceLink="$(SourceLink)"
>
<Vbc Condition=" '%(_CoreCompileResourceInputs.WithCulture)' != 'true' " AdditionalLibPaths="$(AdditionalLibPaths)" AddModules="@(AddModules)" AdditionalFiles="@(AdditionalFiles)" Analyzers="@(Analyzer)" BaseAddress="$(BaseAddress)" ChecksumAlgorithm="$(ChecksumAlgorithm)" CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)" CodePage="$(CodePage)" DebugType="$(DebugType)" DefineConstants="$(FinalDefineConstants)" DelaySign="$(DelaySign)" DisabledWarnings="$(NoWarn)" DocumentationFile="@(DocFileItem)" EmbeddedFiles="@(EmbeddedFiles)" EmitDebugInformation="$(DebugSymbols)" EnvironmentVariables="$(VbcEnvironment)" ErrorLog="$(ErrorLog)" ErrorReport="$(ErrorReport)" Features="$(Features)" FileAlignment="$(FileAlignment)" GenerateDocumentation="$(GenerateDocumentation)" HighEntropyVA="$(HighEntropyVA)" Imports="@(Import)" Instrument="$(Instrument)" KeyContainer="$(KeyContainerName)" KeyFile="$(KeyOriginatorFile)" LangVersion="$(LangVersion)" LinkResources="@(LinkResource)" MainEntryPoint="$(StartupObject)" ModuleAssemblyName="$(ModuleAssemblyName)" NoConfig="true" NoStandardLib="$(NoCompilerStandardLib)" NoVBRuntimeReference="$(NoVBRuntimeReference)" NoWarnings="$(_NoWarnings)" NoWin32Manifest="$(NoWin32Manifest)" Optimize="$(Optimize)" Deterministic="$(Deterministic)" PublicSign="$(PublicSign)" OptionCompare="$(OptionCompare)" OptionExplicit="$(OptionExplicit)" OptionInfer="$(OptionInfer)" OptionStrict="$(OptionStrict)" OptionStrictType="$(OptionStrictType)" OutputAssembly="@(IntermediateAssembly)" PdbFile="$(PdbFile)" Platform="$(PlatformTarget)" Prefer32Bit="$(Prefer32Bit)" PreferredUILang="$(PreferredUILang)" ProvideCommandLineArgs="$(ProvideCommandLineArgs)" References="@(ReferencePath)" RemoveIntegerChecks="$(RemoveIntegerChecks)" ReportAnalyzer="$(ReportAnalyzer)" Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)" ResponseFiles="$(CompilerResponseFile)" RootNamespace="$(RootNamespace)" RuntimeMetadataVersion="$(RuntimeMetadataVersion)" SdkPath="$(FrameworkPathOverride)" SkipCompilerExecution="$(SkipCompilerExecution)" Sources="@(Compile)" SubsystemVersion="$(SubsystemVersion)" TargetCompactFramework="$(TargetCompactFramework)" TargetType="$(OutputType)" ToolExe="$(VbcToolExe)" ToolPath="$(VbcToolPath)" TreatWarningsAsErrors="$(TreatWarningsAsErrors)" UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)" UseSharedCompilation="$(UseSharedCompilation)" Utf8Output="$(Utf8Output)" VBRuntimePath="$(VBRuntimePath)" Verbosity="$(VbcVerbosity)" VsSessionGuid="$(VsSessionGuid)" WarningsAsErrors="$(WarningsAsErrors)" WarningsNotAsErrors="$(WarningsNotAsErrors)" Win32Icon="$(ApplicationIcon)" Win32Manifest="$(Win32Manifest)" Win32Resource="$(Win32Resource)" VBRuntime="$(VBRuntime)" PathMap="$(PathMap)" SourceLink="$(SourceLink)">
<Output TaskParameter="CommandLineArgs" ItemName="VbcCommandLineArgs" />
</Vbc>
<ItemGroup>
<_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
</ItemGroup>
<CallTarget Targets="$(TargetsTriggeredByCompilation)" Condition="'$(TargetsTriggeredByCompilation)' != ''"/>
<CallTarget Targets="$(TargetsTriggeredByCompilation)" Condition="'$(TargetsTriggeredByCompilation)' != ''" />
</Target>
</Project>
\ No newline at end of file
src/Compilers/Server/ServerShared/ServerShared.shproj
浏览文件 @ 57518b93
......@@ -5,18 +5,10 @@
<ProjectGuid>32691768-af9c-4cae-9d0f-10721091b9aa</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props')" />
<Import
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props')" />
<PropertyGroup />
<Import Project="ServerShared.projitems" Label="Shared" />
<Import
Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"
Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets')" />
</Project>
\ No newline at end of file
src/ExpressionEvaluator/Core/Source/Concord/Concord.csproj
浏览文件 @ 57518b93
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\..\build\Targets\Settings.props" />
......
src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj
浏览文件 @ 57518b93
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\..\build\Targets\Settings.props" />
......
src/NuGet/NuGet.proj
浏览文件 @ 57518b93
......@@ -8,7 +8,7 @@
<Exec Command="$(OutDir)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutDir) $(NuGetPerBuildPreReleaseVersion) $(OutDir)NuGet\PerBuildPreRelease" Condition="'$(NuGetPerBuildPreReleaseVersion)' != ''" />
<!-- NuGetPreReleaseVersion -->
<Exec Command="$(OutDir)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutDir) $(NuGetPreReleaseVersion) $(OutDir)NuGet\PreRelease" Condition="'$(NuGetPreReleaseVersion)' != ''"/>
<Exec Command="$(OutDir)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutDir) $(NuGetPreReleaseVersion) $(OutDir)NuGet\PreRelease" Condition="'$(NuGetPreReleaseVersion)' != ''" />
<!-- NuGetReleaseVersion -->
<Exec Command="$(OutDir)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutDir) $(NuGetReleaseVersion) $(OutDir)NuGet\Release" Condition="'$(NuGetReleaseVersion)' != ''" />
......
src/Setup/DevDivPackages/Roslyn.proj
浏览文件 @ 57518b93
......@@ -7,22 +7,21 @@
<PackagesOutDir>$(OutDir)DevDivPackages\Roslyn</PackagesOutDir>
</PropertyGroup>
<ItemGroup>
<NuSpec Include="$(InsertionFilesDir)\VS.ExternalAPIs.Roslyn.nuspec" >
<NuSpec Include="$(InsertionFilesDir)\VS.ExternalAPIs.Roslyn.nuspec">
<Version>$(NuGetPerBuildPreReleaseVersion)</Version>
<!-- TFS build number isn't set on CI server -->
<Version Condition="'$(NuGetPerBuildPreReleaseVersion)' == ''">$(NuGetReleaseVersion)-cibuild</Version>
</NuSpec>
<NuSpec Include="$(InsertionFilesDir)\VS.Tools.Roslyn.nuspec" >
<NuSpec Include="$(InsertionFilesDir)\VS.Tools.Roslyn.nuspec">
<Version>$(NuGetPerBuildPreReleaseVersion)</Version>
<!-- TFS build number isn't set on CI server -->
<Version Condition="'$(NuGetPerBuildPreReleaseVersion)' == ''">$(NuGetReleaseVersion)-cibuild</Version>
</NuSpec>
</ItemGroup>
<Target Name="Build" Inputs="@(NuSpec)" Outputs="@(NuSpec->$(PackagesOutDir)\%(Filename)%(Extension).%(Version).nupkg">
<Target Name="Build" Inputs="@(NuSpec)" Outputs="@(NuSpec-&gt;$(PackagesOutDir)\%(Filename)%(Extension).%(Version).nupkg">
<MakeDir Directories="$(PackagesOutDir)" Condition="!Exists('$(PackagesOutDir)')" />
<!-- nuget doesn't set exitcode when the value of an arg is invalid -->
<Exec Command='Pack.cmd %(NuSpec.FullPath) %(NuSpec.Version) $(OutDir) $(PackagesOutDir)'
CustomErrorRegularExpression="pack: invalid arguments"/>
<Exec Command="Pack.cmd %(NuSpec.FullPath) %(NuSpec.Version) $(OutDir) $(PackagesOutDir)" CustomErrorRegularExpression="pack: invalid arguments" />
</Target>
<Target Name="Clean">
<RemoveDir Directories="$(PackagesOutDir)" />
......
src/Setup/SetupStep1.proj
浏览文件 @ 57518b93
......@@ -6,22 +6,18 @@
<Import Project="..\..\build\Targets\Settings.props" />
<ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project Include="Deployment\Current\Roslyn.Deployment.Full.csproj">
<Project Include="Deployment\Current\Roslyn.Deployment.Full.csproj">
<!-- No reason to rebuild the VSIXes again that were built previously -->
<AdditionalProperties>BuildProjectReferences=false</AdditionalProperties>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project Include="Deployment\Next\Roslyn.Deployment.Full.Next.csproj">
<Project Include="Deployment\Next\Roslyn.Deployment.Full.Next.csproj">
<!-- No reason to rebuild the VSIXes again that were built previously -->
<AdditionalProperties>BuildProjectReferences=false</AdditionalProperties>
</Project>
</ItemGroup>
<ItemGroup>
<PowerShellScriptsToCopy Include="PowerShell\*.ps1"/>
<PowerShellScriptsToCopy Include="PowerShell\*.ps1" />
</ItemGroup>
<Target Name="Build">
......@@ -30,8 +26,8 @@
<MSBuild Projects="@(Project)" Targets="Build" BuildInParallel="false" />
<Copy SourceFiles="@(PowerShellScriptsToCopy)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
<Copy SourceFiles="@(PowerShellScriptsToCopy)" DestinationFolder="Templates\CSharp\Diagnostic\Analyzer"/>
<Copy SourceFiles="@(PowerShellScriptsToCopy)" DestinationFolder="Templates\VisualBasic\Diagnostic\Analyzer\tools"/>
<Copy SourceFiles="@(PowerShellScriptsToCopy)" DestinationFolder="Templates\CSharp\Diagnostic\Analyzer" />
<Copy SourceFiles="@(PowerShellScriptsToCopy)" DestinationFolder="Templates\VisualBasic\Diagnostic\Analyzer\tools" />
<!-- Roslyn SDK -->
<!-- Because the SDK references 1.0 versions of roslyn, we want it to build into its own folder to avoid overwriting other components -->
......
src/Setup/SetupStep2.proj
浏览文件 @ 57518b93
......@@ -8,7 +8,7 @@
<!-- Build CoreXT packages for insertion into DevDiv (order of the following actions matters) -->
<MSBuild Projects="DevDivInsertionFiles\DevDivInsertionFiles.sln" />
<Exec Command='"$(OutDir)\Exes\DevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe" "$(OutDir)\" "$(MSBuildThisFileDirectory)\" "$(NuGetPackageRoot)" $(AssemblyVersion)' LogStandardErrorAsError="true" />
<Exec Command="&quot;$(OutDir)\Exes\DevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe&quot; &quot;$(OutDir)\&quot; &quot;$(MSBuildThisFileDirectory)\&quot; &quot;$(NuGetPackageRoot)&quot; $(AssemblyVersion)" LogStandardErrorAsError="true" />
<MSBuild Projects="DevDivPackages\Roslyn.proj" />
<MSBuild Projects="DevDivVsix\PortableFacades\PortableFacades.vsmanproj" />
<MSBuild Projects="DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.vsmanproj" />
......
src/Setup/Templates/CSharp/Diagnostic/Analyzer/DiagnosticAnalyzer.csproj
浏览文件 @ 57518b93
......@@ -67,10 +67,7 @@
<GetAssemblyIdentity AssemblyFiles="$(OutDir)\$(AssemblyName).dll">
<Output TaskParameter="Assemblies" ItemName="AnalyzerAssemblyInfo" />
</GetAssemblyIdentity>
<Exec Command="&quot;$(SolutionDir)packages\NuGet.CommandLine.2.8.5\tools\NuGet.exe&quot; pack Diagnostic.nuspec -NoPackageAnalysis -Version %(AnalyzerAssemblyInfo.Version) -OutputDirectory ."
WorkingDirectory="$(OutDir)"
LogStandardErrorAsError="true"
ConsoleToMSBuild="true">
<Exec Command="&quot;$(SolutionDir)packages\NuGet.CommandLine.2.8.5\tools\NuGet.exe&quot; pack Diagnostic.nuspec -NoPackageAnalysis -Version %(AnalyzerAssemblyInfo.Version) -OutputDirectory ." WorkingDirectory="$(OutDir)" LogStandardErrorAsError="true" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
</Exec>
</Target>
......
src/Setup/Templates/CSharp/Diagnostic/Test/Test.csproj
浏览文件 @ 57518b93
......@@ -36,17 +36,17 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System"/>
$if$ ($targetframeworkversion$ >= 3.5)
<Reference Include="System.Core"/>
<Reference Include="System.Xml.Linq"/>
<Reference Include="System.Data.DataSetExtensions"/>
<Reference Include="System" />
$if$ ($targetframeworkversion$ &gt;= 3.5)
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
$endif$
$if$ ($targetframeworkversion$ >= 4.0)
<Reference Include="Microsoft.CSharp"/>
$if$ ($targetframeworkversion$ &gt;= 4.0)
<Reference Include="Microsoft.CSharp" />
$endif$
<Reference Include="System.Data"/>
<Reference Include="System.Xml"/>
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework"><Private>false</Private></Reference>
</ItemGroup>
<ItemGroup>
......
src/Setup/Templates/VisualBasic/Diagnostic/Analyzer/Diagnostic.vbproj
浏览文件 @ 57518b93
......@@ -109,10 +109,7 @@
<GetAssemblyIdentity AssemblyFiles="$(OutDir)\$(AssemblyName).dll">
<Output TaskParameter="Assemblies" ItemName="AnalyzerAssemblyInfo" />
</GetAssemblyIdentity>
<Exec Command="&quot;$(SolutionDir)packages\NuGet.CommandLine.2.8.5\tools\NuGet.exe&quot; pack Diagnostic.nuspec -NoPackageAnalysis -Version %(AnalyzerAssemblyInfo.Version) -OutputDirectory ."
WorkingDirectory="$(OutDir)"
LogStandardErrorAsError="true"
ConsoleToMSBuild="true">
<Exec Command="&quot;$(SolutionDir)packages\NuGet.CommandLine.2.8.5\tools\NuGet.exe&quot; pack Diagnostic.nuspec -NoPackageAnalysis -Version %(AnalyzerAssemblyInfo.Version) -OutputDirectory ." WorkingDirectory="$(OutDir)" LogStandardErrorAsError="true" ConsoleToMSBuild="true">
<Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
</Exec>
</Target>
......
src/Setup/Vsix/Vsix.proj
浏览文件 @ 57518b93
......@@ -8,5 +8,5 @@
<Target Name="Build">
<Copy SourceFiles="@(VsixUploadConfigs)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
</Target>
<Target Name="Clean"/>
<Target Name="Clean" />
</Project>
\ No newline at end of file
src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj
浏览文件 @ 57518b93
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\build\Targets\Settings.props" />
......
src/Tools/Vsdconfig/Vsdconfig.targets
浏览文件 @ 57518b93
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="GenerateVsdconfig"
AfterTargets="CoreCompile"
BeforeTargets="AfterCompile"
Inputs="@(VsdConfigXml);$(IntermediateOutputPath)\$(AssemblyName).dll"
Outputs="$(OutDir)\$(AssemblyName).vsdconfig"
Condition="'$(BuildingProject)' == 'true' AND '$(SkipGenerateVsdconfig)' != 'true'">
<Exec Command="&quot;$(DevEnvDir)\..\..\VSSDK\VisualStudioIntegration\Tools\Bin\vsdconfigtool.exe&quot; @(VsdConfigXml->'%(RelativeDir)%(FileName)%(Extension)', ' ') &quot;$(IntermediateOutputPath)\$(AssemblyName).dll&quot; &quot;$(OutDir)\$(AssemblyName).vsdconfig&quot;" />
<Target Name="GenerateVsdconfig" AfterTargets="CoreCompile" BeforeTargets="AfterCompile" Inputs="@(VsdConfigXml);$(IntermediateOutputPath)\$(AssemblyName).dll" Outputs="$(OutDir)\$(AssemblyName).vsdconfig" Condition="'$(BuildingProject)' == 'true' AND '$(SkipGenerateVsdconfig)' != 'true'">
<Exec Command="&quot;$(DevEnvDir)\..\..\VSSDK\VisualStudioIntegration\Tools\Bin\vsdconfigtool.exe&quot; @(VsdConfigXml-&gt;'%(RelativeDir)%(FileName)%(Extension)', ' ') &quot;$(IntermediateOutputPath)\$(AssemblyName).dll&quot; &quot;$(OutDir)\$(AssemblyName).vsdconfig&quot;" />
</Target>
<Target Name="VsdConfigOutputGroup" Outputs="@(VsdConfigOutputGroupOutput)">
......
src/Workspaces/CoreTestUtilities/TestFiles/CSharpProject_CSharpProject_BadElement.csproj
浏览文件 @ 57518b93
......@@ -42,6 +42,6 @@
<Compile Include="CSharpClass.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<BadElement/>
<BadElement />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或