Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Merge release/dev16.11-vs-deps to release/dev17.0-vs-deps #54591

Merged
merged 10 commits into from
Jul 4, 2021
Merged

Merge release/dev16.11-vs-deps to release/dev17.0-vs-deps #54591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
38cfd04
Fix OptProf drop path in 16.10
genlu Jul 1, 2021
5e938c3
Merge pull request #54523 from dotnet/merges/release/dev16.11-to-rele…
Jul 1, 2021
bb9639a
Merge pull request #54516 from dotnet/dev/gel/OptprofDropPath
JoeRobich Jul 1, 2021
3bfa29c
Merge pull request #54539 from dotnet/merges/release/dev16.10-to-rele…
Jul 1, 2021
b081f1a
Merge pull request #54541 from dotnet/merges/release/dev16.10-to-rele…
Jul 1, 2021
47f5299
Set prerelease version label
JoeRobich Jul 1, 2021
49a655e
Merge pull request #54553 from dotnet/merges/release/dev16.10-vs-deps…
Jul 2, 2021
5b99642
Merge pull request #54550 from JoeRobich/fix-pr-val
JoeRobich Jul 2, 2021
a0fd004
Merge pull request #54564 from dotnet/merges/release/dev16.11-to-rele…
RikkiGibson Jul 2, 2021
e73cf01
Merge pull request #54578 from dotnet/merges/release/dev16.11-to-rele…
Jul 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions azure-pipelines-pr-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ stages:
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
/p:DotnetPublishUsingPipelines=false
/p:PreReleaseVersionLabel=pr-validation
condition: succeeded()

# Publish OptProf generated JSON files as a build artifact. This allows for easy inspection from
Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.vbproj
View file
Open in desktop
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 Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj
View file
Open in desktop
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 Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>
<!-- NuGet -->
<IsPackable>true</IsPackable>
<PackageDescription>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
View file
Open in desktop
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 Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</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
Open in desktop
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 Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.vbproj
View file
Open in desktop
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 Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>
<!-- NuGet -->
<IsPackable>true</IsPackable>
<PackageDescription>
Expand Down
1 change: 1 addition & 0 deletions src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@
<PropertyGroup>
<_OptimizedNuGetPackageVersionSuffix Condition="'$(OfficialBuild)' != 'true'">vs-ci</_OptimizedNuGetPackageVersionSuffix>
<_OptimizedNuGetPackageVersionSuffix Condition="'$(OfficialBuild)' == 'true'">vs-$(VersionSuffixDateStamp)-$(VersionSuffixBuildOfTheDayPadded)</_OptimizedNuGetPackageVersionSuffix>
<_OptimizedNuGetPackageVersionSuffix Condition="'$(PreReleaseVersionLabel)' == 'pr-validation'">pr-validation-$(VersionSuffixDateStamp)-$(VersionSuffixBuildOfTheDayPadded)</_OptimizedNuGetPackageVersionSuffix>
</PropertyGroup>

<MakeDir Directories="$(VisualStudioBuildPackagesDir)"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj
View file
Open in desktop
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 Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj
View file
Open in desktop
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 Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>

<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/VisualBasic/Portable/Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj
View file
Open in desktop
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 Condition="'$(TargetFramework)' == 'netstandard2.0'">partial</ApplyNgenOptimization>

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