Skip to content
This repository has been archived by the owner on Jul 15, 2023. It is now read-only.

Bugfix/495 dotnet build #496

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfix/495 dotnet build #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05bc869
Fixes: #471 Can't build in VS 2015
Apr 12, 2017
d4d73af
Fix: #495 code contracts build within dotnet
Sep 21, 2017
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 Microsoft.Research/Contracts/Contracts.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tools", "Tools\Tools.csproj", "{F3259C18-92B3-4C24-ABFD-1B57BAFFDA95}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsCorlib.Contracts", "MsCorlib\MsCorlib.Contracts.csproj", "{D45E4F81-3252-4000-9818-F8D018895B5B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsCorlib.Contracts", "MsCorlib\MsCorlib.Contracts10.csproj", "{D45E4F81-3252-4000-9818-F8D018895B5B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Contracts", "System\System.Contracts.csproj", "{2C10FDB2-966D-4A14-B18D-385FDFA1746A}"
EndProject
Expand Down
Binary file added Microsoft.Research/Imported/ReferenceAssemblies/.NETFramework/v4.6/Microsoft.VisualBasic.dll
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion Microsoft.Research/ManagedContract.Setup/MSBuild/v15.0/Microsoft.CodeContracts.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,10 @@
</ItemGroup>
</Target>

<!-- sn.exe does not exist in .NET Core, so don't run this target in .NET Core -->
<Target
Name="CodeContractReSign"
Condition="'$(DelaySign)' != 'true'"
Condition="'$(DelaySign)' != 'true' and '$(UsingMicrosoftNETSdk)' != 'true'"
>
<GetFrameworkSdkPath>
<Output
Expand Down