Skip to content

Add roslyn repo to known-good #404

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
dseefeld merged 11 commits into from
Apr 10, 2018
Merged

Add roslyn repo to known-good #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ec6f3d3
Move roslyn repo to branch without patches
dseefeld Apr 6, 2018
75d5b62
Patch tools for SDK issue: https://github.com/dotnet/sdk/pull/1997
dseefeld Apr 6, 2018
5237e13
Add updaters to update global.json and Tools.props
dseefeld Apr 7, 2018
1d69556
Change UpdateXml to write output properly
dseefeld Apr 7, 2018
397d3b8
Add patches for roslyn
dseefeld Apr 7, 2018
6195a38
Update roslyn.proj to build the source-build solution. Remove unneed…
dseefeld Apr 9, 2018
bac9af8
Add roslyn to known-good.proj
dseefeld Apr 9, 2018
439a1ab
Move roslyn sha to commit that corrects issue with SourceBuild.sln and
dseefeld Apr 9, 2018
9918a03
Merge branch 'dev/release/2.1' into updateRoslynFor2.1
dseefeld Apr 9, 2018
e0039e8
Remove UpdateJson task because it is causing a conflict with newtonso…
dseefeld Apr 10, 2018
1ffb505
Merge branch 'updateRoslynFor2.1' of https://github.com/dseefeld/sour…
dseefeld Apr 10, 2018
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
3 changes: 3 additions & 0 deletions init-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@ ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x

"$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools"

echo "Patching Sdk to workaround issue https://github.com/dotnet/sdk/pull/1997"
(cd "$__scriptpath";git apply --ignore-whitespace --whitespace=nowarn "$__scriptpath/tools-local/patches/0001-Patch-Tools-for-sdk-pr-1997.patch")

mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE"

echo "Done initializing tools."
Expand Down
284 changes: 284 additions & 0 deletions patches/roslyn/0001-Add-helper-to-pack-packages-using-dotnet-cli.patch
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions patches/roslyn/0002-Update-CLI-version-in-global-json.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 086ec61f141e0882aa7b833446ec44774228bd0c Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Tue, 10 Apr 2018 12:23:10 +0000
Subject: [PATCH] Update CLI version in global.json

---
global.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index ec01c56..72338ce 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "2.1.300-preview2-008324"
+ "version": "2.1.101"
}
}
--
1.8.3.1

2 changes: 1 addition & 1 deletion repos/known-good.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<RepositoryReference Include="symreader" />
<RepositoryReference Include="msbuild" />
<RepositoryReference Include="clicommandlineparser" />
<!--RepositoryReference Include="roslyn" /-->
<RepositoryReference Include="roslyn" />

<!-- Tier 2 -->
<RepositoryReference Include="nuget-client" />
Expand Down
5 changes: 2 additions & 3 deletions repos/roslyn.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<NuGetPackageVersion>2.3.2-beta1-61921-05</NuGetPackageVersion>
<BuildNumber>20170721.5</BuildNumber>
<CommitHash>ad0efbb6975c74e3e19051896be7ffcbb70d2122</CommitHash>
<BuildCommand>$(DotnetToolCommand) build $(ProjectDirectory)/CLI.sln /p:Configuration=$(Configuration) /p:OfficialBuild=true /p:BuildNumber=$(BuildNumber) /p:DotNetBuildFromSource='$(DotNetBuildFromSource)'</BuildCommand>
<BuildCommand>$(DotnetToolCommand) build $(ProjectDirectory)/SourceBuild.sln /p:Configuration=$(Configuration) /p:OfficialBuild=true /p:BuildNumber=$(BuildNumber)</BuildCommand>
<PackagesOutput>$(ProjectDirectory)/Binaries/packages</PackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
</PropertyGroup>
Expand All @@ -27,15 +27,14 @@
<NuSpecFiles Include="$(ProjectDirectory)/src/NuGet/Microsoft.CodeAnalysis.Compilers.nuspec" />
<NuSpecFiles Include="$(ProjectDirectory)/src/NuGet/Microsoft.CodeAnalysis.VisualBasic.nuspec" />
<NuSpecFiles Include="$(ProjectDirectory)/src/NuGet/Microsoft.Net.Compilers.netcore.nuspec" />
<NuSpecFiles Include="$(ProjectDirectory)/src/NuGet/Microsoft.CodeAnalysis.Build.Tasks.nuspec" />
</ItemGroup>

<Target Name="Restore" BeforeTargets="Build">
<PropertyGroup>
<RestoreArgs Condition="'$(OS)' != 'Windows_NT'">--disable-parallel</RestoreArgs>
</PropertyGroup>

<Exec Command="$(DotnetToolCommand) restore $(RestoreArgs) $(ProjectDirectory)/CLI.sln $(RedirectRepoOutputToLog)"
<Exec Command="$(DotnetToolCommand) restore $(RestoreArgs) $(ProjectDirectory)/SourceBuild.sln $(RedirectRepoOutputToLog)"
WorkingDirectory="$(ProjectDirectory)"
EnvironmentVariables="@(EnvironmentVariables)" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion src/roslyn
Open in desktop
Submodule roslyn updated 872 files
25 changes: 25 additions & 0 deletions tools-local/patches/0001-Patch-Tools-for-sdk-pr-1997.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 735b7c82a16ddf16f39643830acb2ee62d2f3150 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Fri, 6 Apr 2018 15:52:18 +0000
Subject: [PATCH] blah2

---
.../sdk/2.1.101/Sdks/Microsoft.NET.Sdk/build/Microsoft.NET.Sdk.targets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/dotnetcli/sdk/2.1.101/Sdks/Microsoft.NET.Sdk/build/Microsoft.NET.Sdk.targets b/Tools/dotnetcli/sdk/2.1.101/Sdks/Microsoft.NET.Sdk/build/Microsoft.NET.Sdk.targets
index 577b74d..18dc593 100755
--- a/Tools/dotnetcli/sdk/2.1.101/Sdks/Microsoft.NET.Sdk/build/Microsoft.NET.Sdk.targets
+++ b/Tools/dotnetcli/sdk/2.1.101/Sdks/Microsoft.NET.Sdk/build/Microsoft.NET.Sdk.targets
@@ -421,7 +421,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</SatelliteAssemblyAttribute>
</ItemGroup>

- <WriteCodeFragment AssemblyAttributes="@(SatelliteAssemblyAttribute)" Language="$(Language)" OutputFile="$(_AssemblyInfoFile)">
+ <WriteCodeFragment AssemblyAttributes="@(SatelliteAssemblyAttribute)" Language="C#" OutputFile="$(_AssemblyInfoFile)">
<Output TaskParameter="OutputFile" ItemName="FileWrites" />
</WriteCodeFragment>

--
1.8.3.1