Skip to content

Commit b305c9c

Browse files
ppekrolppekrol
committed
moved to CPM
1 parent 55a59c2 commit b305c9c

File tree

8 files changed

+86
-76
lines changed

8 files changed

+86
-76
lines changed

‎DemoCommon/DemoCommon.csproj

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net8.0</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
8-
<PackageReference Include="RavenDB.Client" Version="6.2.1" />
9-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
10-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
11-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
6+
<PackageReference Include="RavenDB.Client" />
7+
<PackageReference Include="System.Formats.Asn1" />
8+
<PackageReference Include="System.Net.Http" />
9+
<PackageReference Include="System.Text.RegularExpressions" />
10+
<PackageReference Include="Newtonsoft.Json" VersionOverride="13.0.3" />
1211
</ItemGroup>
13-
14-
</Project>
12+
</Project>

‎DemoCron/DemoCron.csproj

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
54
<TargetFramework>net8.0</TargetFramework>
65
</PropertyGroup>
7-
86
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
11-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
12-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
13-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
14-
<PackageReference Include="NLog.Extensions.Logging" Version="1.5.0" />
15-
<PackageReference Include="RavenDB.Client" Version="6.2.1" />
16-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
17-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
18-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
7+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
9+
<PackageReference Include="Microsoft.Extensions.Logging" />
10+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
12+
<PackageReference Include="NLog.Extensions.Logging" />
13+
<PackageReference Include="RavenDB.Client" />
14+
<PackageReference Include="System.Formats.Asn1" />
15+
<PackageReference Include="System.Net.Http" />
16+
<PackageReference Include="System.Text.RegularExpressions" />
17+
<PackageReference Include="Newtonsoft.Json" VersionOverride="13.0.3" />
1918
</ItemGroup>
20-
2119
<ItemGroup>
2220
<ProjectReference Include="..\DemoCommon\DemoCommon.csproj" />
2321
</ItemGroup>
24-
2522
<ItemGroup>
2623
<None Update="appsettings.json">
2724
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -30,5 +27,4 @@
3027
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3128
</None>
3229
</ItemGroup>
33-
34-
</Project>
30+
</Project>

‎DemoParser.Tests/DemoParser.Tests.csproj

+9-19
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net8.0</TargetFramework>
5-
64
<IsPackable>false</IsPackable>
75
</PropertyGroup>
8-
96
<ItemGroup>
107
<Compile Remove="DemoCodeBuilderTests\Input.cs" />
118
<Compile Remove="DemoCodeBuilderTests\MultipleDemoRegions\Input.cs" />
@@ -23,15 +20,13 @@
2320
<Compile Remove="TokenizerTests\Csharp\Input.cs" />
2421
<Compile Remove="TokenizerTests\Input.cs" />
2522
</ItemGroup>
26-
2723
<ItemGroup>
2824
<None Remove="RegionParserTests\Java\MultipleDemoRegionsInput.java" />
2925
<None Remove="TokenizerTests\Java\Input.java" />
3026
<None Update="RegionParserTests\Go\Input.go">
3127
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3228
</None>
3329
</ItemGroup>
34-
3530
<ItemGroup>
3631
<Content Include="FileHashTests\Input_Changed.cs">
3732
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -67,7 +62,6 @@
6762
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6863
</Content>
6964
</ItemGroup>
70-
7165
<ItemGroup>
7266
<None Include="DemoCodeBuilderTests\SingleDemoRegion\Input.cs">
7367
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -84,24 +78,22 @@
8478
<None Include="RegionParserTests\Csharp\MultipleDemoRegionsInput.cs" />
8579
<None Include="TokenizerTests\Csharp\Input.cs" />
8680
</ItemGroup>
87-
8881
<ItemGroup>
89-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
90-
<PackageReference Include="RavenDB.Client" Version="6.2.1" />
91-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
92-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
93-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
94-
<PackageReference Include="xunit" Version="2.4.1" />
95-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
82+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
83+
<PackageReference Include="RavenDB.Client" />
84+
<PackageReference Include="System.Formats.Asn1" />
85+
<PackageReference Include="System.Net.Http" />
86+
<PackageReference Include="System.Text.RegularExpressions" />
87+
<PackageReference Include="xunit" />
88+
<PackageReference Include="xunit.runner.visualstudio">
9689
<PrivateAssets>all</PrivateAssets>
9790
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
9891
</PackageReference>
92+
<PackageReference Include="Newtonsoft.Json" VersionOverride="13.0.3" />
9993
</ItemGroup>
100-
10194
<ItemGroup>
10295
<ProjectReference Include="..\DemoParser\DemoParser.csproj" />
10396
</ItemGroup>
104-
10597
<ItemGroup>
10698
<Compile Update="MockSrc\CSharp\Basics\Demo101\Code.cs">
10799
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -113,7 +105,6 @@
113105
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
114106
</Compile>
115107
</ItemGroup>
116-
117108
<ItemGroup>
118109
<None Update="DemoCodeBuilderTests\JavaRegions\ExpectedOutput.txt">
119110
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -155,5 +146,4 @@
155146
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
156147
</None>
157148
</ItemGroup>
158-
159-
</Project>
149+
</Project>

‎DemoParser/DemoParser.csproj

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net8.0</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
8-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
9-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
10-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
11-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
6+
<PackageReference Include="Newtonsoft.Json" />
7+
<PackageReference Include="System.Formats.Asn1" />
8+
<PackageReference Include="System.Net.Http" />
9+
<PackageReference Include="System.Text.RegularExpressions" />
1210
</ItemGroup>
13-
14-
</Project>
11+
</Project>

‎DemoServer.sln

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28010.2019
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35514.174 d17.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DemoServer", "DemoServer\DemoServer.csproj", "{4B6AF9F7-9F0D-44F4-A5F2-7E784F0AB41E}"
77
EndProject
@@ -15,6 +15,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoCron", "DemoCron\DemoCr
1515
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoCommon", "DemoCommon\DemoCommon.csproj", "{13C7D269-F824-406E-B3CF-1F490C2C4A00}"
1717
EndProject
18+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{252777BB-6284-49B2-AAA7-123F5D6DFF55}"
19+
ProjectSection(SolutionItems) = preProject
20+
Directory.Packages.props = Directory.Packages.props
21+
EndProjectSection
22+
EndProject
1823
Global
1924
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2025
Debug|Any CPU = Debug|Any CPU

‎DemoServer/DemoServer.csproj

+13-22
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
32
<PropertyGroup>
43
<TargetFramework>net8.0</TargetFramework>
54
<SpaRoot>client\</SpaRoot>
65
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
76
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
87
<TypeScriptToolsVersion>3.0</TypeScriptToolsVersion>
98
</PropertyGroup>
10-
119
<ItemGroup>
1210
<Content Remove="Controllers\Demos\demos.json" />
1311
<Content Remove="tsconfig.json" />
@@ -22,7 +20,6 @@
2220
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2321
</Compile>
2422
</ItemGroup>
25-
2623
<ItemGroup>
2724
<None Remove="Data\media_subset.ravendbdump" />
2825
</ItemGroup>
@@ -40,37 +37,32 @@
4037
<None Include="tslint.json" />
4138
<None Include="compilerconfig.json" />
4239
</ItemGroup>
43-
4440
<ItemGroup>
4541
<EmbeddedResource Include="Data\media_subset.ravendbdump" />
4642
</ItemGroup>
47-
4843
<ItemGroup>
49-
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.1.32" />
50-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.11" />
51-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
52-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
53-
<PackageReference Include="NLog.Web.AspNetCore" Version="4.8.2" />
54-
<PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
55-
<PackageReference Include="RavenDB.Client" Version="6.2.1" />
56-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
57-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
58-
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
59-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
44+
<PackageReference Include="Microsoft.AspNetCore.SpaServices" />
45+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" />
46+
<PackageReference Include="Microsoft.Extensions.Configuration" />
47+
<PackageReference Include="Microsoft.Extensions.Logging" />
48+
<PackageReference Include="NLog.Web.AspNetCore" />
49+
<PackageReference Include="NWebsec.AspNetCore.Middleware" />
50+
<PackageReference Include="RavenDB.Client" />
51+
<PackageReference Include="System.Formats.Asn1" />
52+
<PackageReference Include="System.Net.Http" />
53+
<PackageReference Include="System.Text.Encodings.Web" />
54+
<PackageReference Include="System.Text.RegularExpressions" />
55+
<PackageReference Include="Newtonsoft.Json" VersionOverride="13.0.3" />
6056
</ItemGroup>
61-
6257
<ItemGroup>
6358
<ProjectReference Include="..\DemoCommon\DemoCommon.csproj" />
6459
<ProjectReference Include="..\DemoParser\DemoParser.csproj" />
6560
</ItemGroup>
66-
6761
<ItemGroup>
6862
<Content Update="NLog.config">
6963
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
7064
</Content>
7165
</ItemGroup>
72-
73-
7466
<Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
7567
<!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
7668
<Exec Command="npm install --legacy-peer-deps" />
@@ -86,5 +78,4 @@
8678
</ResolvedFileToPublish>
8779
</ItemGroup>
8880
</Target>
89-
90-
</Project>
81+
</Project>

‎Directory.Packages.props

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
8+
<PackageVersion Include="Microsoft.AspNetCore.SpaServices" Version="3.1.32" />
9+
<PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.11" />
10+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
11+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
12+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
13+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
14+
<PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
15+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
17+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
18+
<PackageVersion Include="NLog.Extensions.Logging" Version="1.5.0" />
19+
<PackageVersion Include="NLog.Web.AspNetCore" Version="4.8.2" />
20+
<PackageVersion Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
21+
<PackageVersion Include="RavenDB.Client" Version="6.2.1" />
22+
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
23+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
24+
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
25+
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
26+
<PackageVersion Include="xunit" Version="2.4.1" />
27+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
28+
</ItemGroup>
29+
</Project>

‎NuGet.Config

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
88
<clear />
99
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
10-
<add key="RavenDB [MyGet]" value="https://www.myget.org/F/ravendb/api/v3/index.json" />
1110
</packageSources>
11+
<packageSourceMapping>
12+
<packageSource key="api.nuget.org">
13+
<package pattern="*" />
14+
</packageSource>
15+
</packageSourceMapping>
1216
</configuration>

0 commit comments

Comments
 (0)