Skip to content

Commit 3d27113

Browse files
StephenMolloyStephenMolloy
authored
Update for .Net 4.7.2 (#97)
Co-authored-by: Steve Molloy <[email protected]>
1 parent be6dfe0 commit 3d27113

11 files changed

Lines changed: 321 additions & 105 deletions

‎.nuget/NuGet.exe‎

5.52 MB
Binary file not shown.

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.nuproj‎

Lines changed: 84 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,91 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),RoslynCodeProvider.sln))\tools\RoslynCodeProvider.settings.targets" />
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),RoslynCodeProvider.sln))\tools\RoslynCodeProvider.settings.targets" />
4+
<PropertyGroup>
5+
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
6+
<NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>
7+
<NuSpecFile>$(MSBuildProjectName).nuspec</NuSpecFile>
8+
<IsPackage>true</IsPackage>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<NuGetContent Include="$(AssemblyName).dll">
12+
<Source>$(AssemblyPath)</Source>
13+
<Destination>lib\net45</Destination>
14+
</NuGetContent>
15+
<NuGetContent Include="$(AssemblyName).xml">
16+
<Source>$(OutputPath)</Source>
17+
<Destination>lib\net45</Destination>
18+
</NuGetContent>
19+
<NuGetContent Include="$(AssemblyName).pdb" Condition="'$(NuGetPackSymbols)' == 'true'">
20+
<Source>$(OutputPath)</Source>
21+
<Destination>lib\net45</Destination>
22+
</NuGetContent>
23+
<NuGetContentProject Include="$(RepositoryRoot)\src\$(MSBuildProjectName)\$(MSBuildProjectName).csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />
24+
<NuGetContent Include="Content\net45\*">
25+
<Destination>content\net45</Destination>
26+
</NuGetContent>
27+
<NuGetContent Include="Content\net46\*">
28+
<Destination>content\net46</Destination>
29+
</NuGetContent>
30+
<NuGetContent Include="Content\net472\*">
31+
<Destination>content\net472</Destination>
32+
</NuGetContent>
33+
<NuGetContent Include="build\*">
34+
<Destination>build\net45</Destination>
35+
</NuGetContent>
36+
<NuGetContent Include="build\*">
37+
<Destination>build\net472</Destination>
38+
</NuGetContent>
39+
<NuGetContent Include="build\*">
40+
<Destination>build\net46</Destination>
41+
</NuGetContent>
42+
<NuGetContent Include="build\net45\*">
43+
<Destination>build\net45</Destination>
44+
</NuGetContent>
45+
<NuGetContent Include="build\net46\*">
46+
<Destination>build\net46</Destination>
47+
</NuGetContent>
48+
<NuGetContent Include="build\net472\*">
49+
<Destination>build\net472</Destination>
50+
</NuGetContent>
51+
<NuGetContent Include="tools\*.ps1" Condition="'$(SignAssembly)' != 'true'">
52+
<Destination>tools\net45</Destination>
53+
</NuGetContent>
54+
<NuGetContent Include="tools\signed\*.ps1" Condition="'$(SignAssembly)' == 'true'">
55+
<Destination>tools\net45</Destination>
56+
</NuGetContent>
57+
<NuGetContent Include="tools\$(LocalRoslyn45FolderName)\*">
58+
<Destination>tools\$(LocalRoslyn45FolderName)</Destination>
59+
</NuGetContent>
60+
<NuGetContent Include="tools\$(LocalRoslyn46FolderName)\*">
61+
<Destination>tools\$(LocalRoslyn46FolderName)</Destination>
62+
</NuGetContent>
63+
<NuGetContent Include="tools\$(LocalRoslyn472FolderName)\*">
64+
<Destination>tools\$(LocalRoslyn472FolderName)</Destination>
65+
</NuGetContent>
66+
</ItemGroup>
67+
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
68+
<Target Name="SignPowerShellScript" Condition=" '$(SignAssembly)' == 'true' " AfterTargets="BeforeBuild">
69+
<ItemGroup>
70+
<OriginalScriptFiles Include="$(MSBuildThisFileDirectory)\tools\*.ps1" />
71+
</ItemGroup>
72+
<Copy SourceFiles="@(OriginalScriptFiles)" DestinationFolder="$(MSBuildThisFileDirectory)\tools\signed" SkipUnchangedFiles="true" />
73+
<ItemGroup>
74+
<ScriptFilesToSign Include="$(MSBuildThisFileDirectory)\tools\signed\*.ps1">
75+
<Authenticode>Microsoft400</Authenticode>
76+
</ScriptFilesToSign>
77+
</ItemGroup>
78+
<SignFiles Files="@(ScriptFilesToSign)" Type="$(SignType)" BinariesDirectory="$(MSBuildThisFileDirectory)\tools\signed"
79+
IntermediatesDirectory="$(MSBuildThisFileDirectory)\tools" ESRPSigning="$(ESRPSigning)" UseBearerToken="$(UseBearerToken)" />
80+
</Target>
81+
<Target Name="AfterBuild">
482
<PropertyGroup>
5-
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
6-
<NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>
7-
<NuSpecFile>$(MSBuildProjectName).nuspec</NuSpecFile>
8-
<IsPackage>true</IsPackage>
83+
<OutDir>$(PackageOutputDir)</OutDir>
984
</PropertyGroup>
1085
<ItemGroup>
11-
<NuGetContent Include="$(AssemblyName).dll">
12-
<Source>$(AssemblyPath)</Source>
13-
<Destination>lib\net45</Destination>
14-
</NuGetContent>
15-
<NuGetContent Include="$(AssemblyName).xml">
16-
<Source>$(OutputPath)</Source>
17-
<Destination>lib\net45</Destination>
18-
</NuGetContent>
19-
<NuGetContent Include="$(AssemblyName).pdb" Condition="'$(NuGetPackSymbols)' == 'true'">
20-
<Source>$(OutputPath)</Source>
21-
<Destination>lib\net45</Destination>
22-
</NuGetContent>
23-
<NuGetContent Include="DotNetCompilerPlatformTasks.dll">
24-
<Source>$(OutputPath)</Source>
25-
<Destination>tasks</Destination>
26-
</NuGetContent>
27-
<NuGetContent Include="System.Management.dll">
28-
<Source>$(OutputPath)</Source>
29-
<Destination>tasks</Destination>
30-
</NuGetContent>
31-
<NuGetContentProject Include="$(RepositoryRoot)\src\$(MSBuildProjectName)\$(MSBuildProjectName).csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />
32-
<NuGetContent Include="Content\net45\*">
33-
<Destination>content\net45</Destination>
34-
</NuGetContent>
35-
<NuGetContent Include="Content\net46\*">
36-
<Destination>content\net46</Destination>
37-
</NuGetContent>
38-
<NuGetContent Include="build\*">
39-
<Destination>build\net45</Destination>
40-
</NuGetContent>
41-
<NuGetContent Include="build\*">
42-
<Destination>build\net46</Destination>
43-
</NuGetContent>
44-
<NuGetContent Include="build\net45\*">
45-
<Destination>build\net45</Destination>
46-
</NuGetContent>
47-
<NuGetContent Include="build\net46\*">
48-
<Destination>build\net46</Destination>
49-
</NuGetContent>
50-
<NuGetContent Include="tools\*.ps1" Condition="'$(SignAssembly)' != 'true'">
51-
<Destination>tools\net45</Destination>
52-
</NuGetContent>
53-
<NuGetContent Include="tools\signed\*.ps1" Condition="'$(SignAssembly)' == 'true'">
54-
<Destination>tools\net45</Destination>
55-
</NuGetContent>
56-
<NuGetContent Include="tools\$(LocalRoslynFolderName)\*">
57-
<Destination>tools\$(LocalRoslynFolderName)</Destination>
58-
</NuGetContent>
59-
<NuGetContent Include="tools\$(LocalLatestRoslynFolderName)\*">
60-
<Destination>tools\$(LocalLatestRoslynFolderName)</Destination>
61-
</NuGetContent>
86+
<FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
87+
<Authenticode>NuGet</Authenticode>
88+
</FilesToSign>
6289
</ItemGroup>
63-
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
64-
<Target Name="SignPowerShellScript" Condition=" '$(SignAssembly)' == 'true' " AfterTargets="BeforeBuild">
65-
<ItemGroup>
66-
<OriginalScriptFiles Include="$(MSBuildThisFileDirectory)\tools\*.ps1" />
67-
</ItemGroup>
68-
<Copy SourceFiles="@(OriginalScriptFiles)" DestinationFolder="$(MSBuildThisFileDirectory)\tools\signed" SkipUnchangedFiles="true" />
69-
<ItemGroup>
70-
<ScriptFilesToSign Include="$(MSBuildThisFileDirectory)\tools\signed\*.ps1">
71-
<Authenticode>Microsoft400</Authenticode>
72-
</ScriptFilesToSign>
73-
</ItemGroup>
74-
<SignFiles Files="@(ScriptFilesToSign)" Type="$(SignType)" BinariesDirectory="$(MSBuildThisFileDirectory)\tools\signed"
75-
IntermediatesDirectory="$(MSBuildThisFileDirectory)\tools" ESRPSigning="$(ESRPSigning)" UseBearerToken="$(UseBearerToken)" />
76-
</Target>
77-
<Target Name="AfterBuild">
78-
<PropertyGroup>
79-
<OutDir>$(PackageOutputDir)</OutDir>
80-
</PropertyGroup>
81-
<ItemGroup>
82-
<FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
83-
<Authenticode>NuGet</Authenticode>
84-
</FilesToSign>
85-
</ItemGroup>
86-
</Target>
90+
</Target>
8791
</Project>

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/net46/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.Extensions.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<Target Name="LocateRoslynCompilerFiles">
44
<PropertyGroup>
5-
<RoslynToolPath Condition="'$(RoslynToolPath)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\tools\roslynlatest'))</RoslynToolPath>
5+
<RoslynToolPath Condition="'$(RoslynToolPath)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\tools\roslyn46'))</RoslynToolPath>
66
</PropertyGroup>
77
</Target>
88

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/net472/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.Extensions.targets‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<Target Name="LocateRoslynCompilerFiles">
4+
<PropertyGroup>
5+
<RoslynToolPath Condition="'$(RoslynToolPath)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\tools\roslyn472'))</RoslynToolPath>
6+
</PropertyGroup>
7+
</Target>
8+
9+
</Project>

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net472/app.config.install.xdt‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<appSettings xdt:Transform="InsertIfMissing">
4+
</appSettings>
5+
6+
<appSettings>
7+
<add key="aspnet:RoslynCompilerLocation" xdt:Transform="Remove" xdt:Locator="Match(key)" />
8+
<add key="aspnet:RoslynCompilerLocation" value="roslyn" xdt:Transform="Insert" />
9+
</appSettings>
10+
11+
<!-- If system.codedom tag is absent -->
12+
<system.codedom xdt:Transform="InsertIfMissing">
13+
</system.codedom>
14+
15+
<!-- If compilers tag is absent -->
16+
<system.codedom>
17+
<compilers xdt:Transform="InsertIfMissing">
18+
</compilers>
19+
</system.codedom>
20+
21+
<!-- If a .cs compiler is already present, the existing entry needs to be removed before inserting the new entry -->
22+
<system.codedom>
23+
<compilers>
24+
<compiler
25+
extension=".cs"
26+
xdt:Transform="Remove"
27+
xdt:Locator="Match(extension)" />
28+
</compilers>
29+
</system.codedom>
30+
31+
<!-- Inserting the new compiler -->
32+
<system.codedom>
33+
<compilers>
34+
<compiler
35+
language="c#;cs;csharp"
36+
extension=".cs"
37+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
38+
warningLevel="4"
39+
compilerOptions="/langversion:default /nowarn:1659;1699;1701"
40+
xdt:Transform="Insert" />
41+
</compilers>
42+
</system.codedom>
43+
44+
<!-- If a .vb compiler is already present, the existing entry needs to be removed before inserting the new entry -->
45+
<system.codedom>
46+
<compilers>
47+
<compiler
48+
extension=".vb"
49+
xdt:Transform="Remove"
50+
xdt:Locator="Match(extension)" />
51+
</compilers>
52+
</system.codedom>
53+
54+
<!-- Inserting the new compiler -->
55+
<system.codedom>
56+
<compilers>
57+
<compiler
58+
language="vb;vbs;visualbasic;vbscript"
59+
extension=".vb"
60+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
61+
warningLevel="4"
62+
compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
63+
xdt:Transform="Insert" />
64+
</compilers>
65+
</system.codedom>
66+
</configuration>

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net472/app.config.uninstall.xdt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<appSettings>
4+
<add key="aspnet:RoslynCompilerLocation" value="roslyn" xdt:Transform="Remove" xdt:Locator="Match(key)" />
5+
</appSettings>
6+
<appSettings xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)">
7+
</appSettings>
8+
9+
<system.codedom>
10+
<compilers>
11+
<compiler
12+
extension=".cs"
13+
xdt:Transform="Remove"
14+
xdt:Locator="Match(extension)" />
15+
</compilers>
16+
</system.codedom>
17+
<system.codedom>
18+
<compilers>
19+
<compiler
20+
extension=".vb"
21+
xdt:Transform="Remove"
22+
xdt:Locator="Match(extension)" />
23+
</compilers>
24+
</system.codedom>
25+
<system.codedom>
26+
<compilers xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)" />
27+
</system.codedom>
28+
<system.codedom xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)" />
29+
</configuration>

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net472/web.config.install.xdt‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<!-- If system.codedom tag is absent -->
4+
<system.codedom xdt:Transform="InsertIfMissing">
5+
</system.codedom>
6+
7+
<!-- If compilers tag is absent -->
8+
<system.codedom>
9+
<compilers xdt:Transform="InsertIfMissing">
10+
</compilers>
11+
</system.codedom>
12+
13+
<!-- If a .cs compiler is already present, the existing entry needs to be removed before inserting the new entry -->
14+
<system.codedom>
15+
<compilers>
16+
<compiler
17+
extension=".cs"
18+
xdt:Transform="Remove"
19+
xdt:Locator="Match(extension)" />
20+
</compilers>
21+
</system.codedom>
22+
23+
<!-- Inserting the new compiler -->
24+
<system.codedom>
25+
<compilers>
26+
<compiler
27+
language="c#;cs;csharp"
28+
extension=".cs"
29+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
30+
warningLevel="4"
31+
compilerOptions="/langversion:default /nowarn:1659;1699;1701"
32+
xdt:Transform="Insert" />
33+
</compilers>
34+
</system.codedom>
35+
36+
<!-- If a .vb compiler is already present, the existing entry needs to be removed before inserting the new entry -->
37+
<system.codedom>
38+
<compilers>
39+
<compiler
40+
extension=".vb"
41+
xdt:Transform="Remove"
42+
xdt:Locator="Match(extension)" />
43+
</compilers>
44+
</system.codedom>
45+
46+
<!-- Inserting the new compiler -->
47+
<system.codedom>
48+
<compilers>
49+
<compiler
50+
language="vb;vbs;visualbasic;vbscript"
51+
extension=".vb"
52+
type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
53+
warningLevel="4"
54+
compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
55+
xdt:Transform="Insert" />
56+
</compilers>
57+
</system.codedom>
58+
</configuration>

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net472/web.config.uninstall.xdt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3+
<system.codedom>
4+
<compilers>
5+
<compiler
6+
extension=".cs"
7+
xdt:Transform="Remove"
8+
xdt:Locator="Match(extension)" />
9+
</compilers>
10+
</system.codedom>
11+
<system.codedom>
12+
<compilers>
13+
<compiler
14+
extension=".vb"
15+
xdt:Transform="Remove"
16+
xdt:Locator="Match(extension)" />
17+
</compilers>
18+
</system.codedom>
19+
<system.codedom>
20+
<compilers xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)" />
21+
</system.codedom>
22+
<system.codedom xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)" />
23+
</configuration>

0 commit comments

Comments
 (0)