Skip to content

Commit 082fba6

Browse files
dotnet-maestro[bot]baronfel
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20190321.3 (#6366)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19171.3
1 parent 6e8f83d commit 082fba6

File tree

3 files changed

+11
-26
lines changed

3 files changed

+11
-26
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19170.12">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19171.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>9ba7a4ced36358fc130b762d25a83fa370c296c9</Sha>
8+
<Sha>b3bcf3034ff395bd09066114379ec64736b13633</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/Versions.props

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,44 @@
11
<Project>
2-
32
<PropertyGroup>
43
<!-- opt-out properties -->
54
<UsingToolXUnit>false</UsingToolXUnit>
6-
75
<!-- opt-in properties -->
86
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
97
<UsingToolNuGetRepack>true</UsingToolNuGetRepack>
108
<UsingToolSourceLink>true</UsingToolSourceLink>
119
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
1210
<UsingToolVSSDK>true</UsingToolVSSDK>
1311
</PropertyGroup>
14-
1512
<!-- Version number computation -->
1613
<PropertyGroup>
1714
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
18-
1915
<FSCoreMajorVersion>4.5</FSCoreMajorVersion>
2016
<FSCorePackageVersion>$(FSCoreMajorVersion).5</FSCorePackageVersion>
2117
<FSCoreVersion>$(FSCoreMajorVersion).0</FSCoreVersion>
22-
<FSCoreVersion Condition="'$(OfficialBuildId)' == ''">$(FSCoreVersion).0</FSCoreVersion><!-- PR builds should specify a 4-part version number -->
23-
18+
<FSCoreVersion Condition="'$(OfficialBuildId)' == ''">$(FSCoreVersion).0</FSCoreVersion>
19+
<!-- PR builds should specify a 4-part version number -->
2420
<FSPackageMajorVersion>10.2</FSPackageMajorVersion>
2521
<FSPackageVersion>$(FSPackageMajorVersion).3</FSPackageVersion>
2622
<FSProductVersion>$(FSPackageVersion)</FSProductVersion>
27-
<FSProductVersion Condition="'$(OfficialBuildId)' == ''">$(FSProductVersion).0</FSProductVersion><!-- PR builds should specify a 4-part version number -->
28-
23+
<FSProductVersion Condition="'$(OfficialBuildId)' == ''">$(FSProductVersion).0</FSProductVersion>
24+
<!-- PR builds should specify a 4-part version number -->
2925
<VSMajorVersion>15</VSMajorVersion>
3026
<VSMinorVersion>9</VSMinorVersion>
3127
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3228
<VSAssemblyVersion>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersion>
33-
<VSAssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VSAssemblyVersion).0</VSAssemblyVersion><!-- PR builds should specify a 4-part version number -->
29+
<VSAssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VSAssemblyVersion).0</VSAssemblyVersion>
30+
<!-- PR builds should specify a 4-part version number -->
3431
</PropertyGroup>
35-
3632
<!-- version number assignment -->
3733
<PropertyGroup>
3834
<VersionPrefix>$(FSCoreVersion)</VersionPrefix>
3935
<VersionPrefix Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersion)</VersionPrefix>
4036
<VersionPrefix Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersion)</VersionPrefix>
4137
<VsixVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VsixVersionPrefix>
42-
43-
<AssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VersionPrefix)</AssemblyVersion><!-- PR builds should explicitly specify a version number -->
38+
<AssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VersionPrefix)</AssemblyVersion>
39+
<!-- PR builds should explicitly specify a version number -->
4440
</PropertyGroup>
45-
4641
<PropertyGroup>
47-
4842
<!-- default package sources -->
4943
<RestoreSources>
5044
$(RestoreSources);
@@ -61,10 +55,8 @@
6155
https://vside.myget.org/F/vssdk/api/v3/index.json;
6256
https://vside.myget.org/F/vs-impl/api/v3/index.json;
6357
</RestoreSources>
64-
6558
<!-- version numbers from files -->
6659
<RoslynPackageVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\RoslynPackageVersion.txt').Trim())</RoslynPackageVersion>
67-
6860
<!-- System.* packages -->
6961
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
7062
<SystemConsolePackageVersion>4.3.0</SystemConsolePackageVersion>
@@ -91,21 +83,18 @@
9183
<SystemThreadingThreadPackageVersion>4.3.0</SystemThreadingThreadPackageVersion>
9284
<SystemThreadingThreadPoolPackageVersion>4.3.0</SystemThreadingThreadPoolPackageVersion>
9385
<SystemValueTuplePackageVersion>4.4.0</SystemValueTuplePackageVersion>
94-
9586
<!-- Roslyn packages -->
9687
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
9788
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
9889
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
9990
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
10091
<MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</MicrosoftVisualStudioLanguageServicesPackageVersion>
101-
10292
<!-- Microsoft Build packages -->
10393
<MicrosoftBuildOverallPackagesVersion>15.8.166</MicrosoftBuildOverallPackagesVersion>
10494
<MicrosoftBuildPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildPackageVersion>
10595
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkPackageVersion>
10696
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCorePackageVersion>
10797
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
108-
10998
<!-- Visual Studio packages -->
11099
<EnvDTE80PackageVersion>8.0.1</EnvDTE80PackageVersion>
111100
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalPackageVersion>14.0.25420</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalPackageVersion>
@@ -152,12 +141,10 @@
152141
<VSSDKVSLangProj8PackageVersion>8.0.4</VSSDKVSLangProj8PackageVersion>
153142
<VSSDKVSLangProj11PackageVersion>11.0.4</VSSDKVSLangProj11PackageVersion>
154143
<VSSDKVSHelpPackageVersion>7.0.4</VSSDKVSHelpPackageVersion>
155-
156144
<!-- setup packages -->
157145
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
158146
<MicroBuildCoreSentinelPackageVersion>1.0.0</MicroBuildCoreSentinelPackageVersion>
159147
<MicroBuildPluginsSwixBuildPackageVersion>1.0.147</MicroBuildPluginsSwixBuildPackageVersion>
160-
161148
<!-- other packages -->
162149
<FsCheckPackageVersion>3.0.0-alpha3</FsCheckPackageVersion>
163150
<MicrosoftCompositionPackageVersion>1.0.30</MicrosoftCompositionPackageVersion>
@@ -174,7 +161,5 @@
174161
<NunitXmlTestLoggerPackageVersion>2.1.36</NunitXmlTestLoggerPackageVersion>
175162
<RoslynToolsSignToolPackageVersion>1.0.0-beta2-dev3</RoslynToolsSignToolPackageVersion>
176163
<StrawberryPerl64PackageVersion>5.22.2.1</StrawberryPerl64PackageVersion>
177-
178164
</PropertyGroup>
179-
180165
</Project>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19170.12",
13+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19171.3",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

0 commit comments

Comments
 (0)