Skip to content

Commit

Permalink
Merge pull request #53840 from dotnet/merges/release/dev17.0-preview1…
Browse files Browse the repository at this point in the history 
…-vs-deps-to-main-vs-deps

Merge release/dev17.0-preview1-vs-deps to main-vs-deps
  • Loading branch information
@RikkiGibson
RikkiGibson committed Jun 7, 2021
2 parents e066466 + 5dc3c06 commit a127424
Show file tree
Hide file tree
Showing 27 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<CodeAnalysisRuleSet>..\CSharpCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
<GenerateMicrosoftCodeAnalysisCommitHashAttribute>true</GenerateMicrosoftCodeAnalysisCommitHashAttribute>
<ApplyNgenOptimization Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>
<ApplyNgenOptimization Condition="'$(TargetFramework)' == 'netstandard2.0'">full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/Core/Portable/Microsoft.CodeAnalysis.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<DefineConstants>$(DefineConstants);COMPILERCORE</DefineConstants>
<CodeAnalysisRuleSet>..\CodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
<NoStdLib>true</NoStdLib>
<ApplyNgenOptimization Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>
<ApplyNgenOptimization Condition="'$(TargetFramework)' == 'netstandard2.0'">full</ApplyNgenOptimization>
<GeneratePerformanceSensitiveAttribute>true</GeneratePerformanceSensitiveAttribute>

<!-- NuGet -->
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<CodeAnalysisRuleSet>..\BasicCodeAnalysisRules.ruleset</CodeAnalysisRuleSet>
<GenerateMicrosoftCodeAnalysisCommitHashAttribute>true</GenerateMicrosoftCodeAnalysisCommitHashAttribute>
<RootNamespace></RootNamespace>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Microsoft.CodeAnalysis.Editor.CSharp</RootNamespace>
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
<!-- NuGet -->
<IsPackable>true</IsPackable>
<PackageDescription>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<TargetFramework>net472</TargetFramework>
<UseWpf>true</UseWpf>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);EDITOR_FEATURES</DefineConstants>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- NuGet -->
<PackageId>Microsoft.CodeAnalysis.EditorFeatures.Common</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.Text</RootNamespace>
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<RootNamespace></RootNamespace>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
<!-- NuGet -->
<IsPackable>true</IsPackable>
<PackageDescription>
Expand Down
2 changes: 1 addition & 1 deletion .../CSharp/Source/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<RootNamespace>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator</RootNamespace>
<AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion ...ressionEvaluator/CSharp/Source/ResultProvider/NetFX20/CSharpResultProvider.NetFX20.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</AssemblyName>
<TargetFramework>net20</TargetFramework>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
</PropertyGroup>
<ItemGroup Label="Linked Files">
<Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\RoslynString.cs">
Expand Down
2 changes: 1 addition & 1 deletion ...CSharp/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyName>Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider</AssemblyName>
<!-- We need to support Windows OneCore, which runs Core CLR 1.0 (Windows OneCore) -->
<TargetFramework>netstandard1.3</TargetFramework>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
</PropertyGroup>
<ItemGroup Label="Linked Files">
<Compile Include="..\..\..\..\..\Compilers\Core\Portable\InternalUtilities\RoslynString.cs">
Expand Down
2 changes: 1 addition & 1 deletion ...Evaluator/Core/Source/ExpressionCompiler/Microsoft.CodeAnalysis.ExpressionCompiler.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>netstandard2.0</TargetFramework>
<DefineConstants>$(DefineConstants);EXPRESSIONCOMPILER</DefineConstants>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
</PropertyGroup>
<ItemGroup Label="Linked Files">
<Compile Include="..\..\..\..\Test\PdbUtilities\Shared\DateTimeUtilities.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/ResultProvider.NetFX20.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>net20</TargetFramework>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
</PropertyGroup>
<ItemGroup Label="Linked Files">
<Compile Include="..\..\..\..\..\Compilers\Core\Portable\CaseInsensitiveComparison.cs">
Expand Down
2 changes: 1 addition & 1 deletion ...valuator/Core/Source/ResultProvider/Portable/Microsoft.CodeAnalysis.ResultProvider.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<AssemblyName>Microsoft.CodeAnalysis.ExpressionEvaluator.ResultProvider</AssemblyName>
<!-- We need to support Windows OneCore, which runs Core CLR 1.0 (Windows OneCore) -->
<TargetFramework>netstandard1.3</TargetFramework>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
</PropertyGroup>
<ItemGroup Label="Linked Files">
<Compile Include="..\..\..\..\..\Compilers\Core\Portable\CaseInsensitiveComparison.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.CSharp</RootNamespace>
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Features/Core/Portable/Microsoft.CodeAnalysis.Features.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis</RootNamespace>
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!-- NuGet -->
Expand Down
2 changes: 1 addition & 1 deletion src/Features/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Features.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<RootNamespace></RootNamespace>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<OutputType>Library</OutputType>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- VS Insertion -->
<TargetVsixContainerName>Microsoft.CodeAnalysis.Compilers.vsix</TargetVsixContainerName>
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<UseWpf>true</UseWpf>
<RootNamespace>Microsoft.VisualStudio.LanguageServices.CSharp</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- VSIX -->
<CreateVsixContainer>false</CreateVsixContainer>
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<TargetFramework>net472</TargetFramework>
<UseWpf>true</UseWpf>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- Vsix -->
<CreateVsixContainer>false</CreateVsixContainer>
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<UseWpf>true</UseWpf>
<RootNamespace>Microsoft.VisualStudio.LanguageServices.Implementation</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/VisualBasic/Impl/Microsoft.VisualStudio.LanguageServices.VisualBasic.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<TargetFramework>net472</TargetFramework>
<UseWpf>true</UseWpf>
<RootNamespace></RootNamespace>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- VSIX -->
<CreateVsixContainer>false</CreateVsixContainer>
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Microsoft.CodeAnalysis.CSharp</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);WORKSPACE</DefineConstants>
<GeneratePerformanceSensitiveAttribute>true</GeneratePerformanceSensitiveAttribute>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/Remote/Core/Microsoft.CodeAnalysis.Remote.Workspaces.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>Microsoft.CodeAnalysis.Remote</RootNamespace>
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplyNgenOptimization Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>
<ApplyNgenOptimization Condition="'$(TargetFramework)' == 'netstandard2.0'">full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
<RootNamespace></RootNamespace>
<ApplyNgenOptimization>partial</ApplyNgenOptimization>
<ApplyNgenOptimization>full</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down

0 comments on commit a127424

Please sign in to comment.