diff options
author | Ankit Jain <radical@gmail.com> | 2020-07-21 05:14:28 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-21 05:14:28 +0300 |
commit | 04556aa2c2fb82bf5d2ce3b59f284f97bf20626b (patch) | |
tree | 86f3f87211195e10c11b7c666b1e87c469cd73bf | |
parent | 77eda77b706a109935a2f56cd4b0800bb95735c7 (diff) |
Add Roslyn version 3.7.0-5.20367.1 binaries from the (#43)
.. nuget `Microsoft.Net.Compilers.Toolset .
Files taken from nuget's `tasks/net472` path.
13 files changed, 103 insertions, 16 deletions
diff --git a/Microsoft.Net.Compilers/3.7.0/Microsoft.Build.Tasks.CodeAnalysis.dll b/Microsoft.Net.Compilers/3.7.0/Microsoft.Build.Tasks.CodeAnalysis.dll Binary files differindex 775fe3f..62bdea3 100644 --- a/Microsoft.Net.Compilers/3.7.0/Microsoft.Build.Tasks.CodeAnalysis.dll +++ b/Microsoft.Net.Compilers/3.7.0/Microsoft.Build.Tasks.CodeAnalysis.dll diff --git a/Microsoft.Net.Compilers/3.7.0/Microsoft.CSharp.Core.targets b/Microsoft.Net.Compilers/3.7.0/Microsoft.CSharp.Core.targets index 7db6883..fd58376 100644 --- a/Microsoft.Net.Compilers/3.7.0/Microsoft.CSharp.Core.targets +++ b/Microsoft.Net.Compilers/3.7.0/Microsoft.CSharp.Core.targets @@ -3,10 +3,21 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="Microsoft.Managed.Core.targets"/> - <PropertyGroup Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp' OR '$(_TargetFrameworkVersionWithoutV)' < '3.0') AND - ('$(TargetFrameworkIdentifier)' != '.NETStandard' OR '$(_TargetFrameworkVersionWithoutV)' < '2.1')"> - <MaxSupportedLangVersion Condition="'$(MaxSupportedLangVersion)' == ''">7.3</MaxSupportedLangVersion> - <LangVersion Condition="'$(LangVersion)' == ''">$(MaxSupportedLangVersion)</LangVersion> + <PropertyGroup> + <!-- .NETCoreApp < 3.0, .NETStandard < 2.1, or any other target framework --> + <_MaxSupportedLangVersion Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp' OR '$(_TargetFrameworkVersionWithoutV)' < '3.0') AND + ('$(TargetFrameworkIdentifier)' != '.NETStandard' OR '$(_TargetFrameworkVersionWithoutV)' < '2.1')">7.3</_MaxSupportedLangVersion> + + <!-- .NETCoreApp < 5.0, .NETStandard == 2.1 --> + <_MaxSupportedLangVersion Condition="(('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' < '5.0') OR + ('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(_TargetFrameworkVersionWithoutV)' == '2.1')) AND + '$(_MaxSupportedLangVersion)' == ''">8.0</_MaxSupportedLangVersion> + + <!-- .NETCoreApp == 5.0 --> + <_MaxSupportedLangVersion Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(_TargetFrameworkVersionWithoutV)' == '5.0' AND + '$(_MaxSupportedLangVersion)' == ''">9.0</_MaxSupportedLangVersion> + + <LangVersion Condition="'$(LangVersion)' == '' AND '$(_MaxSupportedLangVersion)' != ''">$(_MaxSupportedLangVersion)</LangVersion> </PropertyGroup> <Target Name="CoreCompile" diff --git a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.CSharp.Scripting.dll b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.CSharp.Scripting.dll Binary files differindex c5fc7cf..46937c8 100644 --- a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.CSharp.Scripting.dll +++ b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.CSharp.Scripting.dll diff --git a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.CSharp.dll b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.CSharp.dll Binary files differindex f53a644..871b174 100644 --- a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.CSharp.dll +++ b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.CSharp.dll diff --git a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.Scripting.dll b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.Scripting.dll Binary files differindex 89d2fd9..7dfad18 100644 --- a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.Scripting.dll +++ b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.Scripting.dll diff --git a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.VisualBasic.dll b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.VisualBasic.dll Binary files differindex fe3edb7..45e0d91 100644 --- a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.VisualBasic.dll +++ b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.VisualBasic.dll diff --git a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.dll b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.dll Binary files differindex 8d8d8db..c3a1ce1 100644 --- a/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.dll +++ b/Microsoft.Net.Compilers/3.7.0/Microsoft.CodeAnalysis.dll diff --git a/Microsoft.Net.Compilers/3.7.0/Microsoft.Managed.Core.targets b/Microsoft.Net.Compilers/3.7.0/Microsoft.Managed.Core.targets index a6c9a14..5949476 100644 --- a/Microsoft.Net.Compilers/3.7.0/Microsoft.Managed.Core.targets +++ b/Microsoft.Net.Compilers/3.7.0/Microsoft.Managed.Core.targets @@ -66,6 +66,70 @@ <!-- ======================== + Property/metadata global .editorconfig Support + ======================== + + Generates a global editor config that contains the evaluation of requested MSBuild properties and item metadata + + Requested properties/items are requested via item groups like: + + <CompilerVisibleProperty Include="PropertyNameToEval" /> + <CompilerVisibleItemMetadata Include="ItemType" MetadataName="MetadataToRetrieve" /> + --> + <UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.GenerateMSBuildEditorConfig" AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Build.Tasks.CodeAnalysis.dll" /> + + <PropertyGroup> + <GeneratedMSBuildEditorConfigFile Condition="'$(GeneratedMSBuildEditorConfigFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).GeneratedMSBuildEditorConfig.editorconfig</GeneratedMSBuildEditorConfigFile> + <GenerateMSBuildEditorConfigFile Condition="'$(GenerateMSBuildEditorConfigFile)' == ''">true</GenerateMSBuildEditorConfigFile> + </PropertyGroup> + + <Target Name="GenerateMSBuildEditorConfigFile" + BeforeTargets="BeforeCompile;CoreCompile" + DependsOnTargets="PrepareForBuild;GenerateMSBuildEditorConfigFileShouldRun;GenerateMSBuildEditorConfigFileCore" /> + + <Target Name="GenerateMSBuildEditorConfigFileShouldRun"> + <PropertyGroup> + <_GeneratedEditorConfigHasItems Condition="'@(CompilerVisibleItemMetadata->Count())' != '0'">true</_GeneratedEditorConfigHasItems> + <_GeneratedEditorConfigShouldRun Condition="'$(GenerateMSBuildEditorConfigFile)' == 'true' and ('$(_GeneratedEditorConfigHasItems)' == 'true' or '@(CompilerVisibleProperty->Count())' != '0')">true</_GeneratedEditorConfigShouldRun> + </PropertyGroup> + </Target> + + <Target Name="GenerateMSBuildEditorConfigFileCore" + Condition="'$(_GeneratedEditorConfigShouldRun)' == 'true'" + Outputs="$(GeneratedMSBuildEditorConfigFile)"> + + <ItemGroup> + <!-- Collect requested properties, and eval their value --> + <_GeneratedEditorConfigProperty Include="@(CompilerVisibleProperty)"> + <Value>$(%(CompilerVisibleProperty.Identity))</Value> + </_GeneratedEditorConfigProperty> + + <!-- Collect the requested items and remember which metadata is wanted --> + <_GeneratedEditorConfigMetadata Include="@(%(CompilerVisibleItemMetadata.Identity))" Condition="'$(_GeneratedEditorConfigHasItems)' == 'true'"> + <ItemType>%(Identity)</ItemType> + <MetadataName>%(CompilerVisibleItemMetadata.MetadataName)</MetadataName> + </_GeneratedEditorConfigMetadata> + + <!-- Record that we'll write a file, and add it to the analyzerconfig inputs --> + <FileWrites Include="$(GeneratedMSBuildEditorConfigFile)" /> + <EditorConfigFiles Include="$(GeneratedMSBuildEditorConfigFile)" /> + </ItemGroup> + + <!-- Transform the collected properties and items into an editor config file --> + <GenerateMSBuildEditorConfig + PropertyItems="@(_GeneratedEditorConfigProperty)" + MetadataItems="@(_GeneratedEditorConfigMetadata)"> + + <Output TaskParameter="ConfigFileContents" + PropertyName="_GeneratedEditorConfigFileContent" /> + </GenerateMSBuildEditorConfig> + + <!-- Write the output to the generated file, if it's changed --> + <WriteLinesToFile Lines="$(_GeneratedEditorConfigFileContent)" File="$(GeneratedMSBuildEditorConfigFile)" Overwrite="True" WriteOnlyWhenDifferent="True" /> + </Target> + + <!-- + ======================== DeterministicSourcePaths ======================== @@ -95,7 +159,8 @@ --> <Target Name="InitializeSourceRootMappedPaths" - DependsOnTargets="_InitializeSourceRootMappedPathsFromSourceControl"> + DependsOnTargets="_InitializeSourceRootMappedPathsFromSourceControl" + Returns="@(SourceRoot)"> <ItemGroup Condition="'@(_MappedSourceRoot)' != ''"> <_MappedSourceRoot Remove="@(_MappedSourceRoot)" /> @@ -143,27 +208,38 @@ Condition="'$(DeterministicSourcePaths)' == 'true'"> <ItemGroup> - <_TopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/> + <_TopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"> + <EscapedKey>$([MSBuild]::ValueOrDefault('%(Identity)', '').Replace(',', ',,').Replace('=', '=='))</EscapedKey> + <EscapedValue>$([MSBuild]::ValueOrDefault('%(MappedPath)', '').Replace(',', ',,').Replace('=', '=='))</EscapedValue> + </_TopLevelSourceRoot> </ItemGroup> <PropertyGroup Condition="'@(_TopLevelSourceRoot)' != ''"> - <!-- TODO: Report error/warning if /pathmap doesn't cover all emitted source paths: https://github.com/dotnet/roslyn/issues/23969 --> - - <!-- TODO: PathMap should accept and ignore empty mapping: https://github.com/dotnet/roslyn/issues/23523 --> - <PathMap Condition="'$(PathMap)' != ''">,$(PathMap)</PathMap> - <!-- Prepend the SourceRoot.MappedPath values to PathMap, if it already has a value. For each emitted source path the compiler applies the first mapping that matches the path. PathMap values set previously will thus only be applied if the mapping provided by SourceRoot.MappedPath doesn't match. Since SourceRoot.MappedPath is also used by SourceLink preferring it over manually set PathMap ensures that PathMap is consistent with SourceLink. - - TODO: quote the paths to avoid misinterpreting ',' and '=' in them as separators, - but quoting doesn't currently work (see https://github.com/dotnet/roslyn/issues/22835). --> - <PathMap>@(_TopLevelSourceRoot->'%(Identity)=%(MappedPath)', ',')$(PathMap)</PathMap> + <PathMap>@(_TopLevelSourceRoot->'%(EscapedKey)=%(EscapedValue)', ','),$(PathMap)</PathMap> </PropertyGroup> </Target> + <!-- + ======= + CopyAdditionalFiles + ======= + + If a user requests that any @(AdditionalFiles) items are copied to the output directory + we add them to the @(None) group to ensure they will be copied. + --> + + <Target Name="CopyAdditionalFiles" + BeforeTargets="AssignTargetPaths"> + <ItemGroup> + <None Include="@(AdditionalFiles)" Condition="'%(AdditionalFiles.CopyToOutputDirectory)' != ''" /> + </ItemGroup> + </Target> + </Project>
\ No newline at end of file diff --git a/Microsoft.Net.Compilers/3.7.0/VBCSCompiler.exe b/Microsoft.Net.Compilers/3.7.0/VBCSCompiler.exe Binary files differindex e777752..298030e 100644 --- a/Microsoft.Net.Compilers/3.7.0/VBCSCompiler.exe +++ b/Microsoft.Net.Compilers/3.7.0/VBCSCompiler.exe diff --git a/Microsoft.Net.Compilers/3.7.0/csc.exe b/Microsoft.Net.Compilers/3.7.0/csc.exe Binary files differindex ded5a92..8d0457e 100644 --- a/Microsoft.Net.Compilers/3.7.0/csc.exe +++ b/Microsoft.Net.Compilers/3.7.0/csc.exe diff --git a/Microsoft.Net.Compilers/3.7.0/csi.exe b/Microsoft.Net.Compilers/3.7.0/csi.exe Binary files differindex 4651aa3..390e29b 100644 --- a/Microsoft.Net.Compilers/3.7.0/csi.exe +++ b/Microsoft.Net.Compilers/3.7.0/csi.exe diff --git a/Microsoft.Net.Compilers/3.7.0/vbc.exe b/Microsoft.Net.Compilers/3.7.0/vbc.exe Binary files differindex c5a5ff6..92c4adf 100644 --- a/Microsoft.Net.Compilers/3.7.0/vbc.exe +++ b/Microsoft.Net.Compilers/3.7.0/vbc.exe diff --git a/Microsoft.Net.Compilers/3.7.0/version.txt b/Microsoft.Net.Compilers/3.7.0/version.txt index 0f3ecb7..370942b 100644 --- a/Microsoft.Net.Compilers/3.7.0/version.txt +++ b/Microsoft.Net.Compilers/3.7.0/version.txt @@ -1 +1 @@ -3.7.0-1.20262.2
\ No newline at end of file +3.7.0-5.20367.1
\ No newline at end of file |