Skip to content

branding update #6321

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

Merged
Forgind merged 3 commits into from
Apr 5, 2021
Merged

branding update #6321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0e745e
branding update
Forgind Apr 2, 2021
bc2cd44
Remove binding redirect
Forgind Apr 3, 2021
bc02f98
Remove codebase, too
Forgind Apr 5, 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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
<VersionPrefix>16.10.0</VersionPrefix>
<VersionPrefix>17.0.0</VersionPrefix>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
Expand Down
5 changes: 0 additions & 5 deletions src/MSBuild/app.amd64.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
<codeBase version="15.1.0.0" href="..\Microsoft.Build.Conversion.Core.dll"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build.CPPTasks.Common" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="16.0.0.0-16.10.0.0" newVersion="16.10.0.0" />
<codeBase version="16.10.0.0" href="..\..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
</dependentAssembly>

<!-- Pull plugins that reference SCI up to our version in case they depended on our copy of the older version -->
<dependentAssembly>
Expand Down
5 changes: 0 additions & 5 deletions src/MSBuild/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@
<bindingRedirect oldVersion="4.0.0.0-16.0.0.0" newVersion="16.0.0.0" />
<codeBase version="16.0.0.0" href=".\amd64\XamlBuildTask.dll" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build.CPPTasks.Common" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
<bindingRedirect oldVersion="16.0.0.0-16.10.0.0" newVersion="16.10.0.0" />
<codeBase version="16.10.0.0" href="..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
</dependentAssembly>

<!-- Workaround for crash in C++ CodeAnalysis scenarios due to https://github.com/Microsoft/msbuild/issues/1675 -->
<dependentAssembly>
Expand Down